Fix the merge for forge
Fix the merge for forge

RainWarrior/MinecraftForge,fcjailybo/MinecraftForge,shadekiller666/MinecraftForge,Vorquel/MinecraftForge,Mathe172/MinecraftForge,mickkay/MinecraftForge,bonii-xx/MinecraftForge,luacs1998/MinecraftForge,jdpadrnos/MinecraftForge,CrafterKina/MinecraftForge,Theerapak/MinecraftForge,karlthepagan/MinecraftForge,Zaggy1024/MinecraftForge,ThiagoGarciaAlves/MinecraftForge,Ghostlyr/MinecraftForge,brubo1/MinecraftForge,blay09/MinecraftForge,dmf444/MinecraftForge,simon816/MinecraftForge