@Override
    public boolean resolveConflict(Project project, Collection<? extends Change> changes, VirtualFile selected) {
      LocalChangeList changeList = getManager(project).getChangeList(changes.iterator().next());
      return CommitChangeListDialog.commitWithExecutor(project, changes, changeList, new ShelveChangesCommitExecutor(project), null, null);
    }
@Override
    public boolean resolveConflict(Project project, Collection<? extends Change> changes, VirtualFile selected)