Fix conflicts

.gitlab-ci.yml

LICENSE

Makefile

README.md

client/.gitlab-ci.yml

client/angular.json

client/jest.config.js

client/karma.conf.js

client/package.json

client/src/app/admin/admin-auth.guard.ts

client/src/app/admin/admin-routing.module.ts

client/src/app/admin/admin.component.html

client/src/app/admin/admin.component.ts

...app/admin/components/attribute/add-attribute.component.ts

...ents/attribute/criteria/generate-option-list.component.ts

...in/components/attribute/criteria/option-form.component.ts

...in/components/attribute/criteria/option-list.component.ts

...components/attribute/criteria/table-criteria.component.ts

...in/components/attribute/criteria/tr-criteria.component.ts

client/src/app/admin/components/attribute/design/index.ts