fixing a merge conflict