merge conflic fix

Author: Dream-Master

dependencies.gradle

@@ -35,7 +35,7 @@
  */
 dependencies {
     api('com.github.GTNewHorizons:NotEnoughItems:2.7.80-GTNH:dev')
-    api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-683-GTNH:dev')
+    api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-684-GTNH:dev')
     api('curse.maven:cofh-core-69162:2388751')
     api('com.github.GTNewHorizons:waila:1.8.12:dev')
     api("com.github.GTNewHorizons:GTNHLib:0.6.39:dev")
@@ -48,7 +48,7 @@ dependencies {
     compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false }
     compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
     compileOnly('com.github.GTNewHorizons:EnderIO:2.9.22:dev')
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.444:dev') {
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.446:dev') {
         exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
         exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial'
     }