diff --cc patches/node/build_add_gn_build_files.patch
index 96734be769,59a813f354..0000000000
--- a/patches/node/build_add_gn_build_files.patch
+++ b/patches/node/build_add_gn_build_files.patch
@@@ -2208,19 -2310,132 +2208,47 @@@ index 000000000000000000000000000000000
  +    f.write(FILENAMES_JSON_HEADER)
  +    f.write(json.dumps(out, sort_keys=True, indent=2, separators=(',', ': ')))
  +    f.write('\n')
++<<<<<<< HEAD
++=======
+ diff --git a/tools/generate_original_fs.py b/tools/generate_original_fs.py
+ new file mode 100644
+ index 0000000000000000000000000000000000000000..a6cdf33f2c0bcca4d7b4eacaa407f1ac5bdcb5cb
+ --- /dev/null
+ +++ b/tools/generate_original_fs.py
+ @@ -0,0 +1,19 @@
+ +import os
+ +import sys
+ +
+ +node_root_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+ +out_dir = sys.argv[1]
+ +fs_files = sys.argv[2:]
+ +
+ +for fs_file in fs_files:
+ +  with open(os.path.join(node_root_dir, fs_file), 'r') as f:
+ +    contents = f.read()
+ +    original_fs_file = fs_file.replace('internal/fs/', 'internal/original-fs/').replace('lib/fs.js', 'lib/original-fs.js')
+ +
+ +    with open(os.path.join(out_dir, fs_file), 'w') as original_f:
+ +      original_f.write(contents)
+ +
+ +    with open(os.path.join(out_dir, original_fs_file), 'w') as transformed_f:
+ +      transformed_contents = contents.replace('internal/fs/', 'internal/original-fs/').replace('require(\'fs', 'require(\'original-fs')
+ +      transformed_f.write(transformed_contents)
+ +
++>>>>>>> fix: original-fs import replacement
  diff --git a/tools/install.py b/tools/install.py
 -index 11616e1bcac5308020eb68fdb811bfb86cb14dd5..74b01f8352021f1105c080dbbf8bb29121a13501 100755
 +index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd4c536570 100755
  --- a/tools/install.py
  +++ b/tools/install.py
 -@@ -199,105 +199,108 @@ def headers(action):
 +@@ -202,60 +202,74 @@ def files(action):
 + def headers(action):
 +   def wanted_v8_headers(files_arg, dest):
       v8_headers = [
 -       # The internal cppgc headers are depended on by the public
 -       # ones, so they need to be included as well.
 --      'deps/v8/include/cppgc/internal/api-constants.h',
 --      'deps/v8/include/cppgc/internal/atomic-entry-flag.h',
 --      'deps/v8/include/cppgc/internal/base-page-handle.h',
 --      'deps/v8/include/cppgc/internal/caged-heap-local-data.h',
 --      'deps/v8/include/cppgc/internal/caged-heap.h',
 --      'deps/v8/include/cppgc/internal/compiler-specific.h',
 --      'deps/v8/include/cppgc/internal/finalizer-trait.h',
 --      'deps/v8/include/cppgc/internal/gc-info.h',
 --      'deps/v8/include/cppgc/internal/logging.h',
 --      'deps/v8/include/cppgc/internal/member-storage.h',
 --      'deps/v8/include/cppgc/internal/name-trait.h',
 --      'deps/v8/include/cppgc/internal/persistent-node.h',
 --      'deps/v8/include/cppgc/internal/pointer-policies.h',
 --      'deps/v8/include/cppgc/internal/write-barrier.h',
 -+      '../../v8/include/cppgc/internal/api-constants.h',
 -+      '../../v8/include/cppgc/internal/atomic-entry-flag.h',
 -+      '../../v8/include/cppgc/internal/base-page-handle.h',
 -+      '../../v8/include/cppgc/internal/caged-heap-local-data.h',
 -+      '../../v8/include/cppgc/internal/caged-heap.h',
 -+      '../../v8/include/cppgc/internal/compiler-specific.h',
 -+      '../../v8/include/cppgc/internal/finalizer-trait.h',
 -+      '../../v8/include/cppgc/internal/gc-info.h',
 -+      '../../v8/include/cppgc/internal/logging.h',
 -+      '../../v8/include/cppgc/internal/member-storage.h',
 -+      '../../v8/include/cppgc/internal/name-trait.h',
 -+      '../../v8/include/cppgc/internal/persistent-node.h',
 -+      '../../v8/include/cppgc/internal/pointer-policies.h',
 -+      '../../v8/include/cppgc/internal/write-barrier.h',
 -       # cppgc headers
 --      'deps/v8/include/cppgc/allocation.h',
  -      'deps/v8/include/cppgc/common.h',
 --      'deps/v8/include/cppgc/cross-thread-persistent.h',
 --      'deps/v8/include/cppgc/custom-space.h',
 --      'deps/v8/include/cppgc/default-platform.h',
 --      'deps/v8/include/cppgc/ephemeron-pair.h',
 --      'deps/v8/include/cppgc/explicit-management.h',
 --      'deps/v8/include/cppgc/garbage-collected.h',
 --      'deps/v8/include/cppgc/heap-consistency.h',
 --      'deps/v8/include/cppgc/heap-handle.h',
 --      'deps/v8/include/cppgc/heap-state.h',
 --      'deps/v8/include/cppgc/heap-statistics.h',
 --      'deps/v8/include/cppgc/heap.h',
 --      'deps/v8/include/cppgc/liveness-broker.h',
 --      'deps/v8/include/cppgc/macros.h',
 --      'deps/v8/include/cppgc/member.h',
 --      'deps/v8/include/cppgc/name-provider.h',
 --      'deps/v8/include/cppgc/object-size-trait.h',
 --      'deps/v8/include/cppgc/persistent.h',
 --      'deps/v8/include/cppgc/platform.h',
 --      'deps/v8/include/cppgc/prefinalizer.h',
 --      'deps/v8/include/cppgc/process-heap-statistics.h',
 --      'deps/v8/include/cppgc/sentinel-pointer.h',
 --      'deps/v8/include/cppgc/source-location.h',
 --      'deps/v8/include/cppgc/testing.h',
 --      'deps/v8/include/cppgc/trace-trait.h',
 --      'deps/v8/include/cppgc/type-traits.h',
 --      'deps/v8/include/cppgc/visitor.h',
 -+      '../../v8/include/cppgc/allocation.h',
 -+      '../../v8/include/cppgc/common.h',
 -+      '../../v8/include/cppgc/cross-thread-persistent.h',
 -+      '../../v8/include/cppgc/custom-space.h',
 -+      '../../v8/include/cppgc/default-platform.h',
 -+      '../../v8/include/cppgc/ephemeron-pair.h',
 -+      '../../v8/include/cppgc/explicit-management.h',
 -+      '../../v8/include/cppgc/garbage-collected.h',
 -+      '../../v8/include/cppgc/heap-consistency.h',
 -+      '../../v8/include/cppgc/heap-handle.h',
 -+      '../../v8/include/cppgc/heap-state.h',
 -+      '../../v8/include/cppgc/heap-statistics.h',
 -+      '../../v8/include/cppgc/heap.h',
 -+      '../../v8/include/cppgc/liveness-broker.h',
 -+      '../../v8/include/cppgc/macros.h',
 -+      '../../v8/include/cppgc/member.h',
 -+      '../../v8/include/cppgc/name-provider.h',
 -+      '../../v8/include/cppgc/object-size-trait.h',
 -+      '../../v8/include/cppgc/persistent.h',
 -+      '../../v8/include/cppgc/platform.h',
 -+      '../../v8/include/cppgc/prefinalizer.h',
 -+      '../../v8/include/cppgc/process-heap-statistics.h',
 -+      '../../v8/include/cppgc/sentinel-pointer.h',
 -+      '../../v8/include/cppgc/source-location.h',
 -+      '../../v8/include/cppgc/testing.h',
 -+      '../../v8/include/cppgc/trace-trait.h',
 -+      '../../v8/include/cppgc/type-traits.h',
 -+      '../../v8/include/cppgc/visitor.h',
 -       # libplatform headers
 --      'deps/v8/include/libplatform/libplatform-export.h',
  -      'deps/v8/include/libplatform/libplatform.h',
 +-      'deps/v8/include/libplatform/libplatform-export.h',
  -      'deps/v8/include/libplatform/v8-tracing.h',
 -+      '../../v8/include/libplatform/libplatform-export.h',
 -+      '../../v8/include/libplatform/libplatform.h',
 -+      '../../v8/include/libplatform/v8-tracing.h',
 -       # v8 headers
 +-      'deps/v8/include/v8.h',
  -      'deps/v8/include/v8-array-buffer.h',
  -      'deps/v8/include/v8-callbacks.h',
  -      'deps/v8/include/v8-container.h',