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

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

  initialize: (@conflicts) ->
    atom.on 'merge-conflicts:resolved', (event) =>


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

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

  quit: -> @finish(MaybeLaterView)

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