Creating merge conflict