[development model-city-design] Resolved merge conflict