Update docs for merging

Remove references to MergeResult and put merge_analysis in the docs.
Merge remote-tracking branch 'carlos/merge-docs'