fixed a merge conflict