diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm
index ab72c3c25e1..fca7a69a666 100644
--- a/code/game/turfs/simulated/floor_attackby.dm
+++ b/code/game/turfs/simulated/floor_attackby.dm
@@ -9,8 +9,6 @@
 			attack_tile(C, L) // Be on help intent if you want to decon something.
 			return
 
-<<<<<<< HEAD
-=======
 	if(istype(C, /obj/item/stack/tile/roofing))
 		var/expended_tile = FALSE // To track the case. If a ceiling is built in a multiz zlevel, it also necessarily roofs it against weather
 		var/turf/T = GetAbove(src)
@@ -55,7 +53,6 @@
 					break
 		return
 
->>>>>>> fb052bc... Merge pull request #5420 from Neerti/weather_visual_fix
 	if(flooring)
 		if(istype(C, /obj/item/weapon))
 			try_deconstruct_tile(C, user)
@@ -159,4 +156,4 @@
 		return
 	if(flooring)
 		return
-	attackby(T, user)
\ No newline at end of file
+	attackby(T, user)