clone3-mergeConflicts