fix conflicts

src/App.vue

src/components/feature/FeatureExtraForm.vue

src/components/feature/FeatureListTable.vue

src/components/project/ProjectMappingContextLayer.vue

src/router/index.js

src/services/feature-api.js

src/store/index.js

src/store/modules/feature.store.js

src/views/feature/Feature_detail.vue

src/views/feature/Feature_list.vue

src/views/feature_type/Feature_type_edit.vue

src/views/project/Project_detail.vue

src/views/project/Project_edit.vue

src/views/project/Project_members.vue

src/views/registration/Login.vue