typo fixes
merge