@Override
    public void conflictResolvedForFile(@NotNull VirtualFile file, @NotNull Resolution resolution) {
      conflictResolvedForFiles(Collections.singletonList(file), resolution);
    }
@Override
    public void conflictResolvedForFile(@NotNull VirtualFile file, @NotNull Resolution resolution)