fix conflict

.gitlab-ci.yml

src/assets/js/utils.js

src/assets/styles/base.css

src/components/Feature/Detail/FeatureHeader.vue

src/components/Map/EditingToolbar.vue

src/components/Project/Detail/ProjectHeader.vue

.../Project/FeaturesListAndMap/FeaturesListAndMapFilters.vue

src/registerServiceWorker.js

src/services/map-service.js

src/store/modules/map.store.js

src/views/Feature/FeatureDetail.vue

src/views/Feature/FeatureEdit.vue

src/views/FeatureType/FeatureTypeDetail.vue

src/views/FeatureType/FeatureTypeEdit.vue

src/views/Project/FeaturesListAndMap.vue

src/views/Project/ProjectDetail.vue