     @prependKeystroke @side.eventName(), @useMeBtn
     @prependKeystroke 'merge-conflicts:revert-current', @revertBtn
 
-    @side.conflict.on 'conflict:resolved', =>
+    @subs.add @side.conflict.onDidResolveConflict =>
       @deleteMarker @side.refBannerMarker
       @deleteMarker @side.marker unless @side.wasChosen()
       @remove()
+
+  detached: -> @subs.dispose()
 
   cover: -> @side.refBannerMarker
 


  initialize: (@side, editorView) ->
    super editorView

    @decoration = null


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

module.exports =
