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

Some important changes