trying to make a merge conflict