diff --git a/angelssmelting/prototypes/override/smelting-override-iron.lua b/angelssmelting/prototypes/override/smelting-override-iron.lua
index 17f6cbd2..904ad627 100644
--- a/angelssmelting/prototypes/override/smelting-override-iron.lua
+++ b/angelssmelting/prototypes/override/smelting-override-iron.lua
@@ -184,8 +184,13 @@ if angelsmods.trigger.smelting_products["iron"].rod then
   --angelsmods.functions.add_flag("iron-stick", "hidden")
   OV.disable_recipe({ "iron-stick" }) --disable vanilla's recipe?
 else
+<<<<<<< HEAD
 --  angelsmods.functions.add_flag("angels-rod-iron", "hidden")
 --  angelsmods.functions.add_flag("angels-rod-stack-iron", "hidden")
+=======
+  angelsmods.functions.add_flag("angels-rod-iron", "hidden")
+  angelsmods.functions.add_flag("angels-rod-stack-iron", "hidden")
+>>>>>>> ecfbebdcdfad3c4216d9596a79d5d4a364667a02
 --  OV.disable_recipe({ "rod-stack-iron-casting", "rod-stack-iron-casting-fast" })
 --  OV.disable_recipe({ "angels-rod-iron-plate", "angels-rod-stack-iron-converting" })
 end