%h4.has-conflicts
  = icon("exclamation-triangle")
  This merge request contains merge conflicts

%p
  Please resolve these conflicts or
  - if @merge_request.can_be_merged_via_command_line_by?(current_user)
    #{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
  - else
    ask someone with write access to this repository to merge this request manually.

%h4.has-conflicts
  = icon("exclamation-triangle")
  This merge request contains merge conflicts

%p
  Please
  = link_to conflicts_namespace_project_merge_request_path(@project.namespace, @project, @merge_request) do
    resolve these conflicts
  or
  - if @merge_request.can_be_merged_via_command_line_by?(current_user)
    #{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
  - else
    ask someone with write access to this repository to merge this request manually.

Make resolve these conflicts text a link to conflicts tab.
Make resolve these conflicts text a link to conflicts tab.
