fixed a merge bug