Merge latest dev and fix conflict

.gitignore

.gitlab-ci.yml

dist/cjs/css-shim-20d21009.js

dist/cjs/dom-1a5de793.js

dist/cjs/hy-accordion-container_14.cjs.entry.js

dist/cjs/hy-baseline.cjs.entry.js

dist/cjs/hy-design-system-demo.cjs.js

dist/cjs/index-80a33ed9.js

dist/cjs/index.cjs.js

dist/cjs/loader.cjs.js

dist/cjs/shadow-css-4c141672.js

dist/collection/assets/Shape Copy.svg

dist/collection/assets/Shape.svg

dist/collection/collection-manifest.json

...on/components/accordion-container/accordion-container.css

dist/collection/components/accordion-item/accordion-item.css

dist/collection/components/baseline/baseline.css

dist/collection/components/baseline/baseline.js

dist/collection/components/button/button.css

dist/collection/components/button/button.js