Add a section describes mergetool
Correct the merge with conflicts section

Actually the example in this section does not contain any conflicts, so
change the section to a better name.
Add a section describes conflicts