diff --git a/crates/perry-hir/src/lower/lower_expr.rs b/crates/perry-hir/src/lower/lower_expr.rs
index 8b4d7656a0b..9de649b44a6 100644
--- a/crates/perry-hir/src/lower/lower_expr.rs
+++ b/crates/perry-hir/src/lower/lower_expr.rs
@@ -115,15 +115,21 @@ fn is_cjs_style_native_default_import(module_name: &str) -> bool {
         module_name,
         "async_hooks"
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> origin/main
             | "constants"
             | "events"
             | "os"
             | "path"
+<<<<<<< HEAD
+=======
 =======
             | "events"
             | "os"
             | "path"
             | "punycode"
+>>>>>>> origin/main
 >>>>>>> origin/main
             | "querystring"
             | "sys"
diff --git a/crates/perry-hir/src/lower/module_decl.rs b/crates/perry-hir/src/lower/module_decl.rs
index 565da256264..b21e9cf0e64 100644
--- a/crates/perry-hir/src/lower/module_decl.rs
+++ b/crates/perry-hir/src/lower/module_decl.rs
@@ -19,15 +19,21 @@ fn is_cjs_style_native_default_import(module_name: &str) -> bool {
         module_name,
         "async_hooks"
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> origin/main
             | "constants"
             | "events"
             | "os"
             | "path"
+<<<<<<< HEAD
+=======
 =======
             | "events"
             | "os"
             | "path"
             | "punycode"
+>>>>>>> origin/main
 >>>>>>> origin/main
             | "querystring"
             | "sys"
diff --git a/crates/perry-runtime/src/object/native_module.rs b/crates/perry-runtime/src/object/native_module.rs
index 5bd79f186c6..2e49b25e8d1 100644
--- a/crates/perry-runtime/src/object/native_module.rs
+++ b/crates/perry-runtime/src/object/native_module.rs
@@ -1339,12 +1339,17 @@ pub(crate) fn native_module_enumerable_keys(module_name: &str) -> Option<&'stati
         "path.default" => Some(PATH_DEFAULT_KEYS),
         "path.posix" | "path.win32" => Some(&[b"_makeLong"]),
         "fs" => Some(FS_NAMESPACE_KEYS),
+<<<<<<< HEAD
+        "constants" => Some(deprecated_constants_namespace_keys()),
+        "constants.default" => Some(deprecated_constants_keys()),
+=======
 <<<<<<< HEAD
         "constants" => Some(deprecated_constants_namespace_keys()),
         "constants.default" => Some(deprecated_constants_keys()),
 =======
         "constants" => Some(deprecated_constants_keys()),
         "buffer" => Some(BUFFER_NAMESPACE_KEYS),
+>>>>>>> origin/main
 >>>>>>> origin/main
         "querystring" => Some(QUERYSTRING_NAMESPACE_KEYS),
         "querystring.default" => Some(QUERYSTRING_DEFAULT_KEYS),
@@ -1443,10 +1448,14 @@ fn create_cjs_default_namespace(module_name: &str) -> Option<f64> {
 fn cjs_default_export_value(module_name: &str) -> Option<f64> {
     match module_name {
         "events" => Some(bound_native_callable_export_value("events", "EventEmitter")),
+<<<<<<< HEAD
+        "async_hooks" | "constants" | "os" | "path" | "querystring" | "url" | "util" => {
+=======
 <<<<<<< HEAD
         "async_hooks" | "constants" | "os" | "path" | "querystring" | "url" | "util" => {
 =======
         "async_hooks" | "os" | "path" | "punycode" | "querystring" | "url" | "util" => {
+>>>>>>> origin/main
 >>>>>>> origin/main
             create_cjs_default_namespace(module_name)
         }
@@ -4577,6 +4586,9 @@ pub(crate) unsafe fn get_native_module_constant(
             _ => None,
         },
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> origin/main
         "constants" => match property {
             "default" if !is_cjs_default_object => cjs_default_export_value("constants"),
             _ => fs_const(property)
@@ -4594,6 +4606,8 @@ pub(crate) unsafe fn get_native_module_constant(
                     }
                 }),
         },
+<<<<<<< HEAD
+=======
 =======
         "constants" => fs_const(property)
             .or_else(|| fs_const_tail(property))
@@ -4616,6 +4630,7 @@ pub(crate) unsafe fn get_native_module_constant(
             _ => None,
         },
         "sqlite.constants" => sqlite_const(property),
+>>>>>>> origin/main
 >>>>>>> origin/main
         "path" => match property {
             "default" if !is_cjs_default_object => cjs_default_export_value("path"),
diff --git a/crates/perry-runtime/src/process.rs b/crates/perry-runtime/src/process.rs
index 090b6691773..0c7f453add2 100644
--- a/crates/perry-runtime/src/process.rs
+++ b/crates/perry-runtime/src/process.rs
@@ -550,12 +550,17 @@ pub extern "C" fn js_process_get_builtin_module(id: f64) -> f64 {
         return f64::from_bits(crate::value::TAG_UNDEFINED);
     };
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> origin/main
     if module_name == "constants" {
         let cjs_default = "constants.default";
         return crate::object::js_create_native_module_namespace(
             cjs_default.as_ptr(),
             cjs_default.len(),
         );
+<<<<<<< HEAD
+=======
 =======
     if module_name == "timers/promises" {
         return unsafe {
@@ -564,6 +569,7 @@ pub extern "C" fn js_process_get_builtin_module(id: f64) -> f64 {
                 "timers_promises".len() as u32,
             )
         };
+>>>>>>> origin/main
 >>>>>>> origin/main
     }
     crate::object::js_create_native_module_namespace(module_name.as_ptr(), module_name.len())