fix typo from manual rebase/merge