Updated merge tutorial with requested changes and fixes to the examples.

Some important changes
lots of typos in this sentence (conflict, dounf?)