diff --git a/code/__defines/items_clothing.dm b/code/__defines/items_clothing.dm
index 658e0d7bb2..aa32b0016e 100644
--- a/code/__defines/items_clothing.dm
+++ b/code/__defines/items_clothing.dm
@@ -39,7 +39,6 @@
 #define NOSLIP                 0x8  // Prevents from slipping on wet floors, in space, etc.
 #define BLOCK_GAS_SMOKE_EFFECT 0x10 // Blocks the effect that chemical clouds would have on a mob -- glasses, mask and helmets ONLY! (NOTE: flag shared with ONESIZEFITSALL)
 #define FLEXIBLEMATERIAL       0x20 // At the moment, masks with this flag will not prevent eating even if they are covering your face.
->>>>>>> dev
 
 // Flags for pass_flags.
 #define PASSTABLE  0x1