index now displays city name by id
removed merge conflict
cleaned css, removed borked index city elements