mergeConflicts