 
   initialize: (@side, editorView) ->
     super editorView
+    @subs = new CompositeDisposable
 
     @decoration = null
 

    @prependKeystroke @side.eventName(), @useMeBtn
    @prependKeystroke 'merge-conflicts:revert-current', @revertBtn

    @side.conflict.on 'conflict:resolved', =>
      @deleteMarker @side.refBannerMarker
      @deleteMarker @side.marker unless @side.wasChosen()
      @remove()

  cover: -> @side.refBannerMarker


{CompositeDisposable} = require 'atom'
{CoveringView} = require './covering-view'

module.exports =
