added functionality to city
fixed merge