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

                @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) ->


  @headingText = 'Merge Complete'

  @headingClass = 'success'

  @bodyMarkup: ->
    @text "That's everything. "
