creates merge conflict