diff --git a/platforms/mixin-common/src/main/resources/terra.common.mixins.json b/platforms/mixin-common/src/main/resources/terra.common.mixins.json
index 167fd166e..ac6af21dc 100644
--- a/platforms/mixin-common/src/main/resources/terra.common.mixins.json
+++ b/platforms/mixin-common/src/main/resources/terra.common.mixins.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< Updated upstream
     "required": true,
     "minVersion": "0.8",
     "package": "com.dfsek.terra.mod.mixin",
@@ -47,4 +48,55 @@
         "defaultRequire": 1
     },
     "refmap": "terra.common.refmap.json"
+=======
+  "required": true,
+  "minVersion": "0.8",
+  "package": "com.dfsek.terra.mod.mixin",
+  "compatibilityLevel": "JAVA_21",
+  "mixins": [
+    "access.BiomeAccessor",
+    "access.MobSpawnerLogicAccessor",
+    "access.StateAccessor",
+    "access.StructureAccessorAccessor",
+    "access.VillagerTypeAccessor",
+    "fix.BeeMoveGoalsUnsynchronizedRandomAccessFix",
+    "generalize.ServerWorldMixin",
+    "implementations.compat.GenerationSettingsFloraFeaturesMixin",
+    "implementations.terra.BiomeMixin",
+    "implementations.terra.HandleImplementationMixin",
+    "implementations.terra.block.BlockMixin",
+    "implementations.terra.block.entity.BlockEntityMixin",
+    "implementations.terra.block.entity.LootableContainerBlockEntityMixin",
+    "implementations.terra.block.entity.MobSpawnerBlockEntityMixin",
+    "implementations.terra.block.entity.SignBlockEntityMixin",
+    "implementations.terra.block.state.BlockStateMixin",
+    "implementations.terra.block.state.PropertyMixin",
+    "implementations.terra.chunk.ChunkRegionMixin",
+    "implementations.terra.chunk.WorldChunkMixin",
+    "implementations.terra.chunk.data.ProtoChunkMixin",
+    "implementations.terra.entity.EntityMixin",
+    "implementations.terra.entity.EntityTypeMixin",
+    "implementations.terra.entity.PlayerEntityMixin",
+    "implementations.terra.entity.ServerCommandSourceMixin",
+    "implementations.terra.inventory.LockableContainerBlockEntityMixin",
+    "implementations.terra.inventory.item.ItemMixin",
+    "implementations.terra.inventory.item.ItemStackMixin",
+    "implementations.terra.inventory.meta.EnchantmentMixin",
+    "implementations.terra.inventory.meta.ItemStackDamageableMixin",
+    "implementations.terra.inventory.meta.ItemStackMetaMixin",
+    "implementations.terra.world.ChunkRegionMixin",
+    "implementations.terra.world.ServerWorldMixin",
+    "invoke.BiomeInvoker",
+    "invoke.FluidBlockInvoker",
+    "lifecycle.DataPackContentsMixin"
+  ],
+  "client": [
+  ],
+  "server": [
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "refmap": "terra.common.refmap.json"
+>>>>>>> Stashed changes
 }
\ No newline at end of file