resolveConflict()