fix typo occurred after a merge commit