diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm
index 43da5073ed..d468e87a34 100644
--- a/code/game/objects/structures/mop_bucket.dm
+++ b/code/game/objects/structures/mop_bucket.dm
@@ -1,28 +1,9 @@
-/obj/structure/mopbucket
-	name = "mop bucket"
-	desc = "Fill it with water, but don't forget a mop!"
-	icon = 'icons/obj/janitor.dmi'
-	icon_state = "mopbucket"
+/obj/structure/mopbucket
+	name = "mop bucket"
+	desc = "Fill it with water, but don't forget a mop!"
+	icon = 'icons/obj/janitor.dmi'
+	icon_state = "mopbucket"
 	density = TRUE
-<<<<<<< HEAD
-	container_type = OPENCONTAINER_1
-	var/amount_per_transfer_from_this = 5	//shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
-
-
-/obj/structure/mopbucket/New()
-	create_reagents(100)
-	..()
-
-/obj/structure/mopbucket/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/mop))
-		if(reagents.total_volume < 1)
-			to_chat(user, "[src] is out of water!</span>")
-		else
-			reagents.trans_to(I, 5)
-			to_chat(user, "<span class='notice'>You wet [I] in [src].</span>")
-			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
-	else
-=======
 	container_type = OPENCONTAINER
 	var/amount_per_transfer_from_this = 5	//shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
 
@@ -40,5 +21,4 @@
 			to_chat(user, "<span class='notice'>You wet [I] in [src].</span>")
 			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
 	else
->>>>>>> 40699a8... [READY]Refactors reagent container types (#33470)
-		return ..()
\ No newline at end of file
+		return ..()