fix typo from merge