diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index cdb93b8f8d3..643c335f739 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -99,10 +99,6 @@
 		slot_l_hand_str = "engiewelding",
 		slot_r_hand_str = "engiewelding",
 		)
-<<<<<<< HEAD
-
-=======
->>>>>>> 9684db1... Merge pull request #6636 from SpaceManiac/patch/syntax
 
 /*
  * Cakehat