@Override
    public boolean canMerge(@NotNull VirtualFile file) {
      GitConflict c = myConflicts.get(file);
      return c != null && !file.isDirectory();
    }
@Override
    public boolean canMerge(@NotNull VirtualFile file)