Expect a merge conflict