diff --git a/gradle.properties b/gradle.properties
index ae692307..5fb3b012 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 aeversion=rv3
 aechannel=beta
-aebuild=21
+aebuild=22
 aegroup=appeng
 aebasename=appliedenergistics2
 
diff --git a/src/main/java/appeng/block/legacy/BlockLegacyController.java b/src/main/java/appeng/block/legacy/BlockLegacyController.java
index 301f027d..bcd8b69d 100644
--- a/src/main/java/appeng/block/legacy/BlockLegacyController.java
+++ b/src/main/java/appeng/block/legacy/BlockLegacyController.java
@@ -80,6 +80,8 @@ public class BlockLegacyController extends AEBaseTileBlock {
                     return ExtraBlockTextures.Controller5.getIcon();
                 case 6:
                     return ExtraBlockTextures.ControllerLinked.getIcon();
+                case 7:
+                    return ExtraBlockTextures.ControllerConflict.getIcon();
             }
         }
         return super.getIcon(direction.ordinal(), w.getBlockMetadata(x, y, z));
diff --git a/src/main/java/appeng/client/texture/ExtraBlockTextures.java b/src/main/java/appeng/client/texture/ExtraBlockTextures.java
index 3037e3e4..eeb97456 100644
--- a/src/main/java/appeng/client/texture/ExtraBlockTextures.java
+++ b/src/main/java/appeng/client/texture/ExtraBlockTextures.java
@@ -126,6 +126,7 @@ public enum ExtraBlockTextures {
     Controller4("Controller4"),
     Controller5("BlockLegacyControllerFront"),
     ControllerLinked("ControllerLinked"),
+    ControllerConflict("ControllerConflict"),
 
     HDChestTop("BlockHDChestTop"),
     HDChestTopParts("BlockHDChestTopParts"),
diff --git a/src/main/java/appeng/tile/legacy/TileLegacyController.java b/src/main/java/appeng/tile/legacy/TileLegacyController.java
index b9eab33d..2e1ea73b 100644
--- a/src/main/java/appeng/tile/legacy/TileLegacyController.java
+++ b/src/main/java/appeng/tile/legacy/TileLegacyController.java
@@ -11,6 +11,7 @@ import appeng.api.features.ILocatable;
 import appeng.api.networking.events.MENetworkCraftingCpuChange;
 import appeng.api.networking.events.MENetworkPowerStorage;
 import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
+import appeng.api.networking.pathing.ControllerState;
 import appeng.me.GridAccessException;
 import appeng.me.cluster.implementations.InternalCraftingCPU;
 import appeng.tile.TileEvent;
@@ -133,6 +134,13 @@ public class TileLegacyController extends AENetworkPowerTile implements ILocatab
         } else if (!getProxy().isActive()) {
             this.powerLevel = 0;
         }
+        try {
+            if (getProxy().getPath().getControllerState() == ControllerState.CONTROLLER_CONFLICT) {
+                this.powerLevel = 7;
+            }
+        } catch (GridAccessException e) {
+            // :P
+        }
 
         if (this.powerLevel != this.lastPowerLevel) {
             this.markForUpdate();