 
   @headingText = 'Merge Complete'
 
-  @highlightClass = 'success'
+  @headingClass = 'success'
 
   @bodyMarkup: ->
     @text "That's everything. "

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

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

