You missed some stuff catboy :)

mcmmo-core/src/main/resources/com/gmail/nossr50/locale/locale_en_US.properties

@@ -55,11 +55,8 @@ Anvil.SingleItemStack=[[RED]]You cannot salvage or repair item stacks that have
 
 #DO NOT USE COLOR CODES IN THE JSON KEYS
 #COLORS ARE DEFINED IN advanced.yml IF YOU WISH TO CHANGE THEM
-<<<<<<< HEAD
-=======
 
 mcMMO.Template.Prefix=[[GOLD]]([[GREEN]]mcMMO[[GOLD]]) [[GRAY]]{0}
->>>>>>> 308e3a4b1f46e9e3de28d6d540dd055a540ed4d5
 # BEGIN STYLING
 Ability.Generic.Refresh=[[GREEN]]**ABILITIES REFRESHED!**
 Ability.Generic.Template.Lock=[[GRAY]]{0}