         @text 'Conflicts'
         @span class: 'pull-right icon icon-fold', click: 'minimize', 'Hide'
         @span class: 'pull-right icon icon-unfold', click: 'restore', 'Show'
-      @ul class: 'list-group', outlet: 'pathList', =>
-        for p in conflicts
-          @li click: 'navigate', class: 'list-item navigate', =>
-            @span class: 'inline-block icon icon-diff-modified status-modified path', p
-            @div class: 'pull-right', =>
-              @span class: 'inline-block text-subtle', "modified by both"
-              @progress class: 'inline-block', max: 100, value: 0
-              @span class: 'inline-block icon icon-dash staged'
+      @div class: 'block', outlet: 'body', =>
+        @ul class: 'list-group', outlet: 'pathList', =>
+          for p in conflicts
+            @li click: 'navigate', class: 'list-item navigate', =>
+              @span class: 'inline-block icon icon-diff-modified status-modified path', p
+              @div class: 'pull-right', =>
+                @span class: 'inline-block text-subtle', "modified by both"
+                @progress class: 'inline-block', max: 100, value: 0
+                @span class: 'inline-block icon icon-dash staged'
+        @div class: 'block pull-right padded', =>
+          @button class: 'btn btn-sm', click: 'quit', 'Quit'
 
   initialize: (@conflicts) ->
     atom.on 'merge-conflicts:resolved', (event) =>


  minimize: ->
    @addClass 'minimized'
    @pathList.hide 'fast'

  restore: ->
    @removeClass 'minimized'
    @pathList.show 'fast'

  refresh: ->
    root = atom.project.getPath()


  @headingText = 'Maybe Later'

  @highlightClass = 'warning'

  @bodyMarkup: ->
    @text "Careful, you've still got conflict markers left!"
