fixConflicts