add select panel prototype
select panel prototype
resolve conflicts
resolve conflicts in city.js