# Conflicts: # src/pages/city/cityDetail.vue # src/pages/detailsNew.vue
# Conflicts: # src/router/routes.js