fix conflict

src/assets/js/map-util.js

src/axios-client.js

src/services/map-api.js

src/services/project-api.js

src/store/index.js

src/store/modules/feature.js

src/store/modules/feature_type.js

src/store/modules/map.js

src/views/feature/Feature_detail.vue

src/views/feature/Feature_edit.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