As part of reviewing our UI strings mentioning merge requests, this change updates the merge request message:

* OLD: "There are merge conflicts"
* NEW: "Merge blocked: merge conflicts must be resolved."

Changelog: changed