fix a merge bug