diff --git a/dependencies.gradle b/dependencies.gradle
index 1dadc7a9..078f91a4 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,7 +2,7 @@
 
 dependencies {
     compile('com.github.GTNewHorizons:NotEnoughItems:2.2.17-GTNH:dev')
-    compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-87-GTNH:dev')
+    compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-92-GTNH:dev')
     compile('curse.maven:cofh-core-69162:2388751')
     compile('com.github.GTNewHorizons:ExtraCells2:2.5.9:dev') {transitive = false}
     compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.8.5:dev")
diff --git a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java
index e5e0e1c7..9b3fa173 100644
--- a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java
+++ b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java
@@ -9,16 +9,7 @@ import appeng.client.gui.widgets.GuiTabButton;
 import appeng.container.AEBaseContainer;
 import appeng.core.AEConfig;
 import appeng.core.localization.GuiText;
-<<<<<<< Updated upstream
-import appeng.core.sync.GuiBridge;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketSwitchGuis;
 import appeng.helpers.Reflected;
-import appeng.parts.reporting.PartPatternTerminal;
-import appeng.parts.reporting.PartPatternTerminalEx;
-=======
-import appeng.helpers.Reflected;
->>>>>>> Stashed changes
 import appeng.util.calculators.ArithHelper;
 import appeng.util.calculators.Calculator;
 import com.glodblock.github.FluidCraft;
diff --git a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java
index 8ae06909..f9881952 100644
--- a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java
+++ b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java
@@ -2,15 +2,6 @@ package com.glodblock.github.network;
 
 import appeng.api.networking.IGridHost;
 import appeng.container.ContainerOpenContext;
-<<<<<<< Updated upstream
-import appeng.container.implementations.ContainerPatternTerm;
-import appeng.container.implementations.ContainerPatternTermEx;
-import appeng.core.sync.AppEngPacket;
-import appeng.core.sync.GuiBridge;
-import appeng.core.sync.network.INetworkInfo;
-import appeng.util.Platform;
-=======
->>>>>>> Stashed changes
 import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminal;
 import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminalEx;
 import com.glodblock.github.client.gui.container.ContainerPatternValueAmount;
@@ -23,10 +14,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import io.netty.buffer.ByteBuf;
-<<<<<<< Updated upstream
-import io.netty.buffer.Unpooled;
-=======
->>>>>>> Stashed changes
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;