Revert "Hardcode exception on conversion for China #2359"

This reverts commit 1fb419c05088392756934ad104d5001d52268f6f.

Original country files was manually corrected, so this hack is no
longer necessary. #2359
Simplify merging scripts