diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm
index 7178dc3a65..abb56f443a 100644
--- a/code/game/turfs/simulated/wall/misc_walls.dm
+++ b/code/game/turfs/simulated/wall/misc_walls.dm
@@ -65,23 +65,8 @@
 	new /obj/effect/temp_visual/ratvar/beam(src)
 	realappearence = new /obj/effect/clockwork/overlay/wall(src)
 	realappearence.linked = src
-<<<<<<< HEAD
-	change_construction_value(5)
-
-/turf/closed/wall/clockwork/examine(mob/user)
-	..()
-	if((is_servant_of_ratvar(user) || isobserver(user)) && linkedcache)
-		to_chat(user, "<span class='brass'>It is linked to a Tinkerer's Cache, generating components!</span>")
 
 /turf/closed/wall/clockwork/Destroy()
-	if(linkedcache)
-		linkedcache.linkedwall = null
-		linkedcache = null
-	change_construction_value(-5)
-=======
-
-/turf/closed/wall/clockwork/Destroy()
->>>>>>> 5b73196... Reebe is fancier now (#31045)
 	if(realappearence)
 		qdel(realappearence)
 		realappearence = null