# Conflicts: # dsk-operate-ui/src/assets/styles/public.scss # dsk-operate-ui/src/views/macro/urban/index.vue