@Override
            public void run(@NotNull ProgressIndicator indicator) {
              resolveConflicts(currentRepository, notification);
            }
@Override
            public void run(@NotNull ProgressIndicator indicator)