Testing conflicting merges