diff --git a/fabric/src/main/java/com/faboslav/friendsandfoes/fabric/mixin/StructureEntityProcessorMixin.java b/fabric/src/main/java/com/faboslav/friendsandfoes/fabric/mixin/StructureEntityProcessorMixin.java
index 5722a1ab..79abb739 100644
--- a/fabric/src/main/java/com/faboslav/friendsandfoes/fabric/mixin/StructureEntityProcessorMixin.java
+++ b/fabric/src/main/java/com/faboslav/friendsandfoes/fabric/mixin/StructureEntityProcessorMixin.java
@@ -128,12 +128,7 @@ private void friendsandfoes_processEntities(
 							serverWorldAccess,
 							serverWorldAccess.getLocalDifficulty(BlockPos.ofFloored(entityPos)),
 							SpawnReason.STRUCTURE,
-<<<<<<< HEAD
 							null
-=======
-							null,
-							entityNbt
->>>>>>> 1.20.4
 						);
 					}