Tbh, I'm not entirely sure I would want to merge this for 2 reasons:
While this is generally unimportant, I'm not certain why there's an effort to change the city name order. In general, while it doesn't really matter, I don't want to change the city order for no reason
Some aspects of some of the cities is already not compatible with ASCII. This can make editing in non ASCII text editors annoying in some cases. For instance, occasionally, I change some of my text editors from UTF-8 to Shift_JIS to read some files. It's annoying having to keep up with both when editing stuff locally, and I'm aware of Android Studio not reading some characters well either. I don't want to make that problem worse.
Fixed cities name