diff --git a/code/modules/materials/materials/organic/cloth.dm b/code/modules/materials/materials/organic/cloth.dm
index 97a1a738fc..f286f22d99 100644
--- a/code/modules/materials/materials/organic/cloth.dm
+++ b/code/modules/materials/materials/organic/cloth.dm
@@ -127,11 +127,6 @@
 	ignition_point = T0C+232
 	melting_point = T0C+300
 	protectiveness = 1 // 4%
-<<<<<<< HEAD
-	conductive = 0
-||||||| parent of f9d340f23b... Merge pull request #11025 from VOREStation/Arokha/crafty
-	conductive = 0
-=======
 	conductive = 0
 
 /datum/material/fibers
@@ -146,4 +141,3 @@
 	protectiveness = 1 // 4%
 	conductive = 0
 	pass_stack_colors = TRUE
->>>>>>> f9d340f23b... Merge pull request #11025 from VOREStation/Arokha/crafty