Testing conflicting merges again