[cities] Fix more character encoding errors
Merge branch 'master' of github.com:kiln/iied
Remove stray conflict markers