introduce merge conflict