diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
index 61ace40879..53348e317e 100644
--- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm
+++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
@@ -174,4 +174,8 @@
 			"<span class='notice'>\The [user] unfastens \the [src].</span>", \
 			"<span class='notice'>You have unfastened \the [src].</span>", \
 			"You hear a ratchet.")
-		deconstruct()
\ No newline at end of file
+<<<<<<< HEAD
+		deconstruct()
+=======
+		deconstruct()
+>>>>>>> 6c61002... Merge pull request #6431 from Moltenkore/master