new city
Resolved city conflict