diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 1e3cf41362..d4269013f7 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -257,10 +257,5 @@
 			B.forceMove(drop_location())
 	for(var/obj/item/honey_frame/HF in honey_frames)
 		if(HF.loc == src)
-<<<<<<< HEAD
-			HF.loc = get_turf(src)
-	qdel(src)
-=======
 			HF.forceMove(drop_location())
 	qdel(src)
->>>>>>> 5233ec1... Finishes the forceMove port (#33519)