If the patch cannot be applied against upstream WPT, it's a severe problem and would cause a mess if the patch lands without resolving the conflicts. We should comment on the CL to warn the authors.