Botania r1.1-60 -> r1.1-62
fix biome conflicts