     GitBridge.add repoPath, (err) ->
       return if handleErr(err)
 
-      atom.emit 'merge-conflicts:staged', file: filePath
+      atom.emitter.emit 'merge-conflicts:staged', file: filePath
 
   @detect: ->
     return unless atom.project.getRepositories().length > 0

        return if handleErr(err)

        full = path.join atom.project.getPaths()[0], p
        atom.emit 'merge-conflicts:resolved', file: full, total: 1, resolved: 1
        atom.workspace.open p

  stageFile: (event, element) ->

          @pathList.find("li:contains('#{p}') .stage-ready").eq(0).hide()

      if @state.isEmpty()
        atom.emitter.emit 'merge-conflicts:done'
        @finish(SuccessView)

  finish: (viewClass) ->
