Fix the city.unity merge conflicts