trying to start a merge conflict