diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index edb80a7f11..169d7f822b 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -61,14 +61,6 @@
 			return
 		if(!charging && default_unfasten_wrench(user, W))
 			return
-<<<<<<< HEAD
-
-		anchored = !anchored
-		to_chat(user, "<span class='notice'>You [anchored ? "attach" : "detach"] [src] [anchored ? "to" : "from"] the ground</span>")
-		playsound(src.loc, W.usesound, 75, 1)
-	else
-=======
->>>>>>> 0b718fa... Cell chargers are now buildable and (upgradable!) machines. (#35517)
 		return ..()
 
 /obj/machinery/cell_charger/deconstruct()
@@ -133,4 +125,4 @@
 	charging.give(charge_rate)	//this is 2558, efficient batteries exist
 
 	updateicon()
- 
\ No newline at end of file
+