diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b761216..30d399d 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 678d9d8..9397848 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 02 15:54:47 CDT 2014
+#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
diff --git a/libs/CraftTweaker-Dev-1.9-3.0.9.jar b/libs/CraftTweaker-Dev-1.9-3.0.9.jar
deleted file mode 100644
index 1873cf4..0000000
Binary files a/libs/CraftTweaker-Dev-1.9-3.0.9.jar and /dev/null differ
diff --git a/src/main/java/modtweaker2/helpers/InputHelper.java b/src/main/java/modtweaker2/helpers/InputHelper.java
index c296634..a64e3e3 100644
--- a/src/main/java/modtweaker2/helpers/InputHelper.java
+++ b/src/main/java/modtweaker2/helpers/InputHelper.java
@@ -5,13 +5,8 @@ import minetweaker.api.item.IIngredient;
 import minetweaker.api.item.IItemStack;
 import minetweaker.api.liquid.ILiquidStack;
 import minetweaker.api.oredict.IOreDictEntry;
-<<<<<<< HEAD
 import minetweaker.mc1102.item.MCItemStack;
 import minetweaker.mc1102.liquid.MCLiquidStack;
-=======
-import minetweaker.mc19.item.MCItemStack;
-import minetweaker.mc19.liquid.MCLiquidStack;
->>>>>>> 1.9
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/modtweaker2/helpers/LogHelper.java b/src/main/java/modtweaker2/helpers/LogHelper.java
index 6c2a41e..0c23da2 100644
--- a/src/main/java/modtweaker2/helpers/LogHelper.java
+++ b/src/main/java/modtweaker2/helpers/LogHelper.java
@@ -5,11 +5,7 @@ import minetweaker.MineTweakerImplementationAPI;
 import minetweaker.api.item.IIngredient;
 import minetweaker.api.oredict.IOreDictEntry;
 import minetweaker.api.player.IPlayer;
-<<<<<<< HEAD
 import minetweaker.mc1102.item.MCItemStack;
-=======
-import minetweaker.mc19.item.MCItemStack;
->>>>>>> 1.9
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;