typos
after merge