WHY DOESN'T GIT MERGE?!

src/main/java/com/zivilon/cinder_loe/items/WarDart.java

@@ -144,9 +144,6 @@ public class WarDart extends Item {
     @Override
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) {
         int damageMeta = stack.getItemDamage();
-        double damagePercent = getDamageFromMeta(damageMeta) * (1.0 / 8) * 100.0;
-        double roundedDamagePercent = 5 * Math.round(damagePercent / 5.0);
-        list.add(EnumChatFormatting.DARK_GREEN + "Ranged damage: " + roundedDamagePercent + "%");
         if (damageMeta > 0) {
             double damagePercent = getDamageFromMeta(damageMeta) * (1.0 / 8) * 100.0;
             double roundedDamagePercent = 5 * Math.round(damagePercent / 5.0);

src/main/java/com/zivilon/cinder_loe/recipes.java

@@ -9,6 +9,7 @@ import com.zivilon.cinder_loe.recipe.*;
 
 import lotr.common.item.LOTRItemFood;
 import net.minecraft.init.Blocks;
+import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;