biome conflicts fixed