@Override
        public void run(@NotNull ProgressIndicator indicator) {
          new HgConflictResolver(project).resolve(repository.getRoot());
          HgUtil.markDirectoryDirty(project, repository.getRoot());
        }
@Override
        public void run(@NotNull ProgressIndicator indicator)