MergeConflictTest