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

      @pkg.didStageFile file: filePath

  @detect: (pkg) ->
    return unless atom.project.getRepositories().length > 0
    return if @instance?

    MergeState.read (err, state) =>
      return if handleErr(err)

      if not state.isEmpty()

    return if state.isEmpty()

    fullPath = editor.getPath()
    repoPath = state.repo.relativize fullPath
    return unless repoPath?

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