Improve documentation for merging
Merge pull request #2132 from ethomson/merge_doc

Improve documentation for merging