fixed a merge error.