Introduce merge conflict