fixed a merge mistake