MergeConflict-Test