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