added a merge conflict