diff --cc patches/node/feat_optionally_prevent_calling_v8_enablewebassemblytraphandler.patch
index 387e83413b,0f8451e6d2..0000000000
--- a/patches/node/feat_optionally_prevent_calling_v8_enablewebassemblytraphandler.patch
+++ b/patches/node/feat_optionally_prevent_calling_v8_enablewebassemblytraphandler.patch
@@@ -10,7 -10,7 +10,11 @@@ already been called
  This should be upstreamed.
  
  diff --git a/src/node.cc b/src/node.cc
++<<<<<<< HEAD
 +index 89e0e5524c2102b86bc5506fe49aa0c6fa0f30c1..e58f28e0f0ff8d61f35ec3c5a69aa37c66c25d78 100644
++=======
+ index 2bed5aec6a1bc362ef4e1e0d6715951537676270..f19948f50fef3518ec3a78b6d685dc35eeec5418 100644
++>>>>>>> feat: support NODE_EXTRA_CA_CERTS
  --- a/src/node.cc
  +++ b/src/node.cc
  @@ -605,6 +605,7 @@ static void PlatformInit(ProcessInitializationFlags::Flags flags) {
diff --cc script/node-disabled-tests.json
index 593ece62e6,b05bff18e0..0000000000
--- a/script/node-disabled-tests.json
+++ b/script/node-disabled-tests.json
@@@ -59,8 -61,7 +59,12 @@@
    "parallel/test-snapshot-weak-reference",
    "parallel/test-snapshot-worker",
    "parallel/test-strace-openat-openssl",
++<<<<<<< HEAD
 +  "parallel/test-tls-cert-chains-concat",
 +  "parallel/test-tls-cert-chains-in-ca",
++=======
+   "parallel/test-tls-alpn-server-client",
++>>>>>>> feat: support NODE_EXTRA_CA_CERTS
    "parallel/test-tls-cli-max-version-1.2",
    "parallel/test-tls-cli-max-version-1.3",
    "parallel/test-tls-cli-min-version-1.1",