     @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)

    return if state.isEmpty()

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

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

      @pkg.didStageFile file: filePath

  @detect: (pkg) ->
    return if @instance?

    repo = GitBridge.getActiveRepo()
    unless repo?
      atom.notifications.addWarning "No git repository found",
        detail: "Tip: if you have multiple projects open, open an editor in the one"
          "containing conflicts."
      return

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

      if not state.isEmpty()
