fix typo and merge error