fix conflict

src/App.vue

src/axios-client.js

src/components/Account/UserProfile.vue

src/components/Feature/Detail/FeatureAttachements.vue

src/components/FeatureType/FeatureTypeLink.vue

src/components/ImportTask.vue

src/components/Map/EditingToolbar.vue

src/components/Map/Geocoder.vue

...omponents/Project/Basemaps/ProjectMappingContextLayer.vue

src/components/Project/Detail/ProjectFeatureTypes.vue

src/components/Project/Detail/ProjectModal.vue

...omponents/Project/FeaturesListAndMap/FeatureListTable.vue

.../Project/FeaturesListAndMap/FeaturesListAndMapFilters.vue

src/main.js

src/router/index.js

src/service-worker.js

src/services/edition-service.js

src/services/map-service.js

src/store/modules/feature-type.store.js

src/store/modules/feature.store.js