Stage a merge conflict