diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm
index 03e975866f..0cd33b1925 100644
--- a/code/game/machinery/doors/shutters.dm
+++ b/code/game/machinery/doors/shutters.dm
@@ -1,15 +1,3 @@
-<<<<<<< HEAD
-/obj/machinery/door/poddoor/shutters
-	gender = PLURAL
-	name = "shutters"
-	desc = "Heavy duty metal shutters that opens mechanically."
-	icon = 'icons/obj/doors/shutters.dmi'
-	layer = CLOSED_DOOR_LAYER
-	damage_deflection = 20
-
-/obj/machinery/door/poddoor/shutters/preopen
-	icon_state = "open"
-=======
 /obj/machinery/door/poddoor/shutters
 	gender = PLURAL
 	name = "shutters"
@@ -20,23 +8,22 @@
 
 /obj/machinery/door/poddoor/shutters/preopen
 	icon_state = "open"
->>>>>>> ca7adb4... Moves opened firedoors underneath opened airlocks (#32018)
 	density = FALSE
-	opacity = 0
-
-
-//shutters look like ass with things on top of them.
-
-/obj/machinery/door/poddoor/shutters/New()
-	..()
-	layer = CLOSED_DOOR_LAYER	//to handle /obj/machinery/door/New() resetting the layer.
-
-
-/obj/machinery/door/poddoor/shutters/open(ignorepower = 0)
-	..()
-	layer = CLOSED_DOOR_LAYER
-
-
-/obj/machinery/door/poddoor/shutters/close(ignorepower = 0)
-	..()
-	layer = CLOSED_DOOR_LAYER
\ No newline at end of file
+	opacity = 0
+
+
+//shutters look like ass with things on top of them.
+
+/obj/machinery/door/poddoor/shutters/New()
+	..()
+	layer = CLOSED_DOOR_LAYER	//to handle /obj/machinery/door/New() resetting the layer.
+
+
+/obj/machinery/door/poddoor/shutters/open(ignorepower = 0)
+	..()
+	layer = CLOSED_DOOR_LAYER
+
+
+/obj/machinery/door/poddoor/shutters/close(ignorepower = 0)
+	..()
+	layer = CLOSED_DOOR_LAYER