fix a merge error