changed city to City
merge error