diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider/nurse.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider/nurse.dm
index 631de88335e2c..141f95b076021 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider/nurse.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider/nurse.dm
@@ -56,7 +56,11 @@
 		var/obj/item/organ/external/O = H.get_organ(target_zone)
 		if(O)
 			var/eggcount = 0
+<<<<<<< ours
 			for(var/obj/effect/spider/eggcluster/E in O.implants)
+=======
+			for(var/obj/spider/eggcluster/small/E in O.implants)
+>>>>>>> theirs
 				eggcount++
 			if(!eggcount)
 				var/eggs = new egg_type(O, src)