private void resolvePossibleConflicts(final UpdatedFiles updatedFiles) {
    new HgConflictResolver(project, updatedFiles).resolve(repoRoot);
  }
private void resolvePossibleConflicts(final UpdatedFiles updatedFiles)