fix conflict

package-lock.json

package.json

src/assets/js/map-util.js

src/assets/js/utils.js

src/assets/js/vector_tile_fix.js

src/assets/styles/base.css

src/assets/styles/openlayers-custom.css

src/assets/styles/sidebar-layers.css

src/components/Feature/Detail/FeatureTable.vue

src/components/FeatureType/FeatureTypeLink.vue

src/components/Map/EditingToolbar.vue

src/components/Map/Geocoder.vue

src/components/Map/SidebarLayers.vue

src/components/Project/Detail/ProjectFeatureTypes.vue

src/main.js

src/services/edition-service.js

src/services/map-service.js

src/store/modules/feature.store.js

src/store/modules/map.store.js

src/views/Feature/FeatureDetail.vue