fix some typos
Merge conflict