fix typo
merge