Revise merge-conflict modal text

Start the process of revising the merge-conflict modal's text. It
has grammar and punctuation problems, a bad verb in the button text,
and needs a link out to the documentation.

Changelog: changed