fixed a merge