fix conflicts

package.json

src/assets/styles/base.css

src/components/Account/UserActivity.vue

src/components/Account/UserProjectsList.vue

src/components/AppHeader.vue

src/components/FeaturesListAndMap/FeatureListTable.vue

src/components/Pagination.vue

src/components/ProjectDetail/ProjectHeader.vue

src/components/SidebarLayers.vue

src/components/feature/FeatureListMassToggle.vue

src/main.js

src/service-worker.js

src/services/feature-api.js

src/services/project-api.js

src/store/index.js

src/store/modules/feature.store.js

src/store/modules/projects.store.js

src/views/Feature/FeatureDetail.vue

src/views/Feature/FeatureEdit.vue

src/views/FeatureType/FeatureTypeDetail.vue