Use remote cities to build city-filter page (new design: controller --> service --> datasource)
Integrated with City API and Resolve merge conflict