     @subs = new CompositeDisposable
 
     @subs.add @pkg.onDidResolveConflict (event) =>
-      p = GitBridge.getActiveRepo().relativize event.file
+      p = GitBridge.getActiveRepo(event.file).relativize event.file
       found = false
       for listElement in @pathList.children()
         li = $(listElement)

    return if state.isEmpty()

    fullPath = editor.getPath()
    repoPath = GitBridge.getActiveRepo()?.relativize fullPath
    return unless repoPath?

    return unless _.contains state.conflictPaths(), repoPath


  stageFile: (event, element) ->
    repoPath = element.closest('li').data('path')
    filePath = path.join GitBridge.getActiveRepo(repoPath).getWorkingDirectory(), repoPath

    for e in atom.workspace.getTextEditors()
      e.save() if e.getPath() is filePath
