Replace 'Delhi' with 'DELHI
Replace 'China' with 'CHINA
Merge branch 'dev'
Replace 'Manila' with 'MANILA
Replace 'Moscow' with 'MOSCOW
Merge branch 'dev'

Conflicts:
	cities