diff --git a/packages/std/src/math/signed_decimal_256.rs b/packages/std/src/math/signed_decimal_256.rs
index e994bd7bac..3266c0b180 100644
--- a/packages/std/src/math/signed_decimal_256.rs
+++ b/packages/std/src/math/signed_decimal_256.rs
@@ -106,7 +106,7 @@ impl SignedDecimal256 {
     /// Create a -1.0 SignedDecimal256
     #[inline]
     pub const fn negative_one() -> Self {
-        // -DECIMAL_FRATIONAL
+        // -DECIMAL_FRACTIONAL
         Self(Int256::from_i128(-1_000_000_000_000_000_000))
     }
 
diff --git a/packages/vm/src/modules/file_system_cache.rs b/packages/vm/src/modules/file_system_cache.rs
index 76c1c5df82..9f4cfa51e9 100644
--- a/packages/vm/src/modules/file_system_cache.rs
+++ b/packages/vm/src/modules/file_system_cache.rs
@@ -401,12 +401,27 @@ mod tests {
         };
         let target = Target::new(triple, wasmer::CpuFeature::POPCNT.into());
         let p = modules_path(&base, 17, &target);
+<<<<<<< HEAD
         assert_eq!(
             p.as_os_str(),
             if cfg!(windows) {
                 "modules\\v13-wasmer17\\x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE"
             } else {
                 "modules/v13-wasmer17/x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE"
+=======
+        let discriminator = raw_module_version_discriminator();
+
+        assert_eq!(
+            p.as_os_str(),
+            if cfg!(windows) {
+                format!(
+                    "modules\\{discriminator}-wasmer17\\x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE"
+                )
+            } else {
+                format!(
+                    "modules/{discriminator}-wasmer17/x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE"
+                )
+>>>>>>> af9d6cb29 (Fix typos)
             }
         );
     }