fix typos
fix merge conflict