@Override
    public boolean resolveConflict(Project project, Collection<? extends Change> changes, VirtualFile selected) {
      ChangelistConflictTracker conflictTracker = ChangelistConflictTracker.getInstance(project);
      for (Change change : changes) {
        VirtualFile file = change.getVirtualFile();
        if (file != null) {
          conflictTracker.ignoreConflict(file, true);
        }
      }
      return true;
    }
@Override
    public boolean resolveConflict(Project project, Collection<? extends Change> changes, VirtualFile selected)