typos, grammar
merge