 
   @headingText = 'Maybe Later'
 
-  @highlightClass = 'warning'
+  @headingClass = 'warning'
 
   @bodyMarkup: ->
     @text "Careful, you've still got conflict markers left!"


  @headingText = 'Merge Complete'

  @highlightClass = 'success'

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

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