fix conflicts

src/App.vue

src/components/ImportTask.vue

src/main.js

src/store/modules/feature.store.js

src/views/My_account.vue

src/views/Projects.vue

src/views/feature_type/Feature_type_detail.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