fixed a merge error