Fix some typos
Merge conflict fix