@Override
    public boolean resolveConflict(Project project, Collection<? extends Change> changes, VirtualFile selected) {
      ChangeListManager manager = getManager(project);
      Set<ChangeList> changeLists = new HashSet<>();
      for (Change change : changes) {
        LocalChangeList list = manager.getChangeList(change);
        if (list != null) {
          changeLists.add(list);
        }
      }
      if (changeLists.isEmpty()) {
        Messages.showInfoMessage(project, VcsBundle.message("dialog.message.conflict.seems.to.be.resolved"),
                                 VcsBundle.message("dialog.title.no.conflict.found"));
        return true;
      }
      MoveChangesDialog dialog = new MoveChangesDialog(project, changes, changeLists, selected);
      if (dialog.showAndGet()) {
        manager.moveChangesTo(manager.getDefaultChangeList(), dialog.getIncludedChanges().toArray(Change.EMPTY_CHANGE_ARRAY));
        return true;
      }
      return false;
    }
@Override
    public boolean resolveConflict(Project project, Collection<? extends Change> changes, VirtualFile selected)