fix conflicts

package.json

public/config/config.json

src/assets/styles/base.css

src/components/ImportTask.vue

src/services/featureType-api.js

src/services/project-api.js

src/store/modules/feature_type.store.js

src/views/feature_type/Feature_type_detail.vue

src/views/feature_type/Feature_type_edit.vue

src/views/feature_type/Feature_type_symbology.vue

src/views/project/Project_detail.vue