Style for resolve conflicts form

app/assets/stylesheets/pages/merge_conflicts.scss

@@ -278,4 +278,8 @@ $colors: (
       margin-left: 10px;
     }
   }
+
+  .resolve-conflicts-form {
+    padding-top: $gl-padding;
+  }
 }

app/views/projects/merge_requests/conflicts/_submit_form.html.haml

-.content-block
-  .commit-message-container.form-group
+.form-horizontal.resolve-conflicts-form
+  .form-group
+    %label.col-sm-2.control-label{ "for" => "commit-message" }
+      Commit message
+    .col-sm-10
+      .commit-message-container
         .max-width-marker
-    %textarea.form-control.js-commit-message{"v-model" => "conflictsData.commitMessage"}
+        %textarea.form-control.js-commit-message#commit-message{ "v-model" => "conflictsData.commitMessage", "rows" => "5" }
           {{{conflictsData.commitMessage}}}
-
-  %button{type: "button", class: "btn btn-success js-submit-button", "@click" => "commit()", ":disabled" => "!readyToCommit" }
+  .form-group
+    .col-sm-offset-2.col-sm-10
+      .row
+        .col-xs-6
+          %button{ type: "button", class: "btn btn-success js-submit-button", "@click" => "commit()", ":disabled" => "!readyToCommit" }
             %span {{commitButtonText}}
-
+        .col-xs-6.text-right
           = link_to "Cancel", namespace_project_merge_request_path(@merge_request.project.namespace, @merge_request.project, @merge_request), class: "btn btn-cancel"