feat(merge): fix merge conflicts

.vscode/settings.json

apps/web-graphpolaris/src/app/app.tsx

...rc/components/querybuilder/customFlowLines/connection.tsx

...omponents/querybuilder/customFlowLines/connectionDrag.tsx

...r/customFlowPills/attributepill/attributepill.module.scss

...rybuilder/customFlowPills/attributepill/attributepill.tsx

.../customFlowPills/attributepill/operatorselect.module.scss

...ybuilder/customFlowPills/attributepill/operatorselect.tsx

...ilder/customFlowPills/attributepill/variables.module.scss

...builder/customFlowPills/entitypill/entitypill.module.scss

...ts/querybuilder/customFlowPills/entitypill/entitypill.tsx

...der/customFlowPills/relationpill/relationpill.module.scss

...uerybuilder/customFlowPills/relationpill/relationpill.tsx

...aris/src/components/querybuilder/querybuilder.module.scss

...aris/src/components/querybuilder/querybuilder.stories.tsx

...graphpolaris/src/components/querybuilder/querybuilder.tsx

libs/querybuilder/usecases/.babelrc

libs/querybuilder/usecases/.eslintrc.json

libs/querybuilder/usecases/README.md

libs/querybuilder/usecases/jest.config.js