A merge conflict