diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json
index 7f5c43a0..a2b25c7e 100644
--- a/src/main/resources/carpet.mixins.json
+++ b/src/main/resources/carpet.mixins.json
@@ -48,14 +48,10 @@
     "FossilFeatureMixin",
     "BuriedTreasureGeneratorPieceMixin",
     "GravityStructureProcessorMixin",
-<<<<<<< HEAD
-    "EntityMixin",
-    "DirectionMixin",
-=======
     "ServerPlayNetworkHandler_scarpetEventsMixin",
     "ServerPlayerInteractionManager_scarpetEventsMixin",
->>>>>>> master
-
+    "EntityMixin",
+    "DirectionMixin",
 
     "ServerChunkManagerMixin",
     "SpawnHelperMixin",