fix typos/merge