diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm
index babe7eba31..b616d456b6 100644
--- a/code/modules/materials/materials.dm
+++ b/code/modules/materials/materials.dm
@@ -1091,7 +1091,4 @@ var/list/name_to_material
 	hardness = 1
 	weight = 1
 	protectiveness = 0 // 0%
-<<<<<<< HEAD
-=======
 	conductive = 0
->>>>>>> 8316113... Merge pull request #6393 from Nalarac/Conductivity