[development model-design-city] Resolved merge conflict