fixed typos
merge