fix conflict in feature_detail with validation

src/store/index.js

src/store/modules/feature.js

src/store/modules/feature_type.js

src/views/feature/Feature_edit.vue

src/views/feature_type/Feature_type_edit.vue

src/views/registration/Login.vue