Fix typos in contribution guidelines.
Make merge conflict instructions a little easier to read.