Fix typos
Merge branch 'fix-typos'
Add tip about `git merge`
Merge branch 'fix-typos'
Add note about using `git mergetool`