diff --git a/Wrench/data/wrench/functions/wrench/convert.mcfunction b/Wrench/data/wrench/functions/wrench/convert.mcfunction
index 0aa7f93..14346b9 100644
--- a/Wrench/data/wrench/functions/wrench/convert.mcfunction
+++ b/Wrench/data/wrench/functions/wrench/convert.mcfunction
@@ -1,8 +1,3 @@
 #Check if wrench has been crafted
-<<<<<<< HEAD
 item replace entity @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":'"Wrench"'}}}] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
 item replace entity @s[nbt={Inventory:[{Slot:-106b, id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":'"Wrench"'}}]}] weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
-=======
-item replace entity @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":'"Wrench"'}}}] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
-item replace entity @s[nbt={Inventory:[{Slot:-106b, id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":'"Wrench"'}}]}] weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
->>>>>>> Gitea/main
diff --git a/Wrench/data/wrench/functions/wrench/give.mcfunction b/Wrench/data/wrench/functions/wrench/give.mcfunction
index 4167eeb..685dd3d 100644
--- a/Wrench/data/wrench/functions/wrench/give.mcfunction
+++ b/Wrench/data/wrench/functions/wrench/give.mcfunction
@@ -1,5 +1 @@
-<<<<<<< HEAD
 give @s minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
-=======
-give @s minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
->>>>>>> Gitea/main
diff --git a/Wrench/data/wrench/functions/wrench/offhand.mcfunction b/Wrench/data/wrench/functions/wrench/offhand.mcfunction
index 2c586bc..2267b61 100644
--- a/Wrench/data/wrench/functions/wrench/offhand.mcfunction
+++ b/Wrench/data/wrench/functions/wrench/offhand.mcfunction
@@ -2,7 +2,6 @@
 scoreboard players set @s WrenchSuccess 0
 
 #Change wrench mode
-<<<<<<< HEAD
 execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Default"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Flip"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
 execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Flip"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Face Player"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
 execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Player"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Face Click"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
@@ -11,7 +10,6 @@ execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{
 # Retun to Default
 execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Terracotta"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
 execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Click"']}}]}] unless score WrenchTerracotta WrenchConfig matches 1 store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
-=======
 execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Default"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench"}',minecraft:lore=['{"text":"Flip"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
 execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Flip"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench"}',minecraft:lore=['{"text":"Face Player"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
 execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Player"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench"}',minecraft:lore=['{"text":"Face Click"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
@@ -20,7 +18,6 @@ execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{
 # Retun to Default
 execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Terracotta"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
 execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Click"']}}]}] unless score WrenchTerracotta WrenchConfig matches 1 store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
->>>>>>> Gitea/main
 
 
 #Confirm with action bar
diff --git a/Wrench/data/wrench/functions/wrench/terracotta.mcfunction b/Wrench/data/wrench/functions/wrench/terracotta.mcfunction
index 8b3aa92..5b6b937 100644
--- a/Wrench/data/wrench/functions/wrench/terracotta.mcfunction
+++ b/Wrench/data/wrench/functions/wrench/terracotta.mcfunction
@@ -1,15 +1,8 @@
 #Advance terracotta mode rotation, show title
-<<<<<<< HEAD
 item replace entity @s[tag=TerracottaNORTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"East"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
 item replace entity @s[tag=TerracottaEAST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"South"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
 item replace entity @s[tag=TerracottaSOUTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"West"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
 item replace entity @s[tag=TerracottaWEST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"North"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
-=======
-item replace entity @s[tag=TerracottaNORTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"East"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
-item replace entity @s[tag=TerracottaEAST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"South"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
-item replace entity @s[tag=TerracottaSOUTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"West"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
-item replace entity @s[tag=TerracottaWEST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"North"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
->>>>>>> Gitea/main
 title @s[tag=TerracottaNORTH] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"East","color":"white"}]
 title @s[tag=TerracottaEAST] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"South","color":"white"}]
 title @s[tag=TerracottaSOUTH] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"West","color":"white"}]