 CONFLICT_CLASSES = "conflict-line resolved ours theirs parent"
 OUR_CLASSES = "conflict-line ours"
 THEIR_CLASSES = "conflict-line theirs"
+RESOLVED_CLASSES = "conflict-line resolved"
 
 module.exports =
 class ConflictMarker

      @remark()
      @editorView.on "editor:display-updated", => @remark()

  ourLines: -> @linesForMarker(c.ours.marker) for c in @conflicts

  theirLines: -> @linesForMarker(c.theirs.marker) for c in @conflicts

  editor: -> @editorView.getEditor()

  linesForMarker: (marker) ->
    fromBuffer = marker.getTailBufferPosition()

      if low <= row and row <= high
        result = result.add @editorView.lineElementForScreenRow row
    result
