Fix merge conflict info

1 files changed, 7 insertions, 1 deletions

diff --git a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
index 46d9b2adc88..2ca21daa2ff 100644
--- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
+++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
@@ -3,7 +3,13 @@
   .form-group
     .col-md-4
       %h4 Resolve conflicts on source branch
-      .resolve-info Resolve the merge conflict by choosing Ours or Theirs in all the conflicted files above. Commit these changes into {{conflictsData.sourceBranch}}.
+      .resolve-info
+        Resolve the merge conflict by choosing
+        %code Use ours
+        or
+        %code Use theirs
+        in all the conflicted files above. Commit these changes into
+        %strong {{conflictsData.sourceBranch}}.
     .col-md-8
       %label.label-light{ "for" => "commit-message" }
         #{ _('Commit message') }