                 @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', =>
+        @div class: 'block pull-right', =>
           @button class: 'btn btn-sm', click: 'quit', 'Quit'
 
   initialize: (@conflicts) ->

        @text 'Conflicts'
        @span class: 'pull-right icon icon-fold', click: 'minimize', 'Hide'
        @span class: 'pull-right icon icon-unfold', click: 'restore', 'Show'
      @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

  @content: ->
    @div class: 'overlay from-top merge-conflicts-message', =>
      @div class: 'panel', click: 'dismiss', =>
        @div class: "panel-heading text-#{@headingClass}", @headingText
        @div class: 'panel-body', =>
          @div class: 'block', =>
            @bodyMarkup()
          @div class: 'block text-subtle', 'click to dismiss'

  initialize: ->

