void conflictResolvedForFiles(@NotNull List<? extends VirtualFile> files, @NotNull Resolution resolution);
void conflictResolvedForFiles(@NotNull List<? extends VirtualFile> files, @NotNull Resolution resolution)