Fixed merge conflict in generateTerrain()