fixing typos
merge