fix typo caused by merge resolution