diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 0c3d0dc978..286efd4345 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 //VOREStation Edit - Redone a lot of airlock things:
 /*
 - Specific department maintenance doors