- if @merge_request.can_be_merged_by?(current_user)
  %h4
    This merge request contains merge conflicts that must be resolved.
    You can try it manually on the
    %strong
      = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
- else
  %strong This merge request contains merge conflicts that must be resolved.
  Only those with write access to this repository can merge merge requests.

- if @merge_request.can_be_merged_by?(current_user)
  %h4
    This merge request contains merge conflicts that must be resolved.
  %p
    You can merge it manually using the
    %strong
      = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
- else
  %strong This merge request contains merge conflicts that must be resolved.
  Only those with write access to this repository can merge merge requests.

Split merge conflict messages on 2 lines
Split merge conflict messages on 2 lines

Signed-off-by: Dmitriy Zaporozhets <be23d75b156792e5acab51b196a2deb155d35d6a@gmail.com>
