CitySDK merge