expecting merge conflict