Fix typos
Fix merge conflict