     return if state.isEmpty()
 
     fullPath = editor.getPath()
-    repoPath = GitBridge.getActiveRepo()?.relativize fullPath
+    repoPath = GitBridge.getActiveRepo(fullPath)?.relativize fullPath
     return unless repoPath?
 
     return unless _.contains state.conflictPaths(), repoPath

    @subs = new CompositeDisposable

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


  navigate: (event, element) ->
    repoPath = element.find(".path").text()
    fullPath = path.join GitBridge.getActiveRepo(repoPath).getWorkingDirectory(), repoPath
    atom.workspace.open(fullPath)

  minimize: ->
