Latest development and fix conflict

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

...ion/components/accordion-container/accordion-container.js

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

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

dist/collection/components/heading/heading.css

dist/collection/components/icon/icon.js

dist/types/components.d.ts

...s/components/accordion-container/accordion-container.d.ts

dist/types/components/accordion-item/accordion-item.d.ts

src/components.d.ts

src/components/accordion-item/accordion-item.scss

src/components/accordion-item/accordion-item.tsx

src/components/grid-item/grid-item.scss

src/components/grid-item/grid-item.tsx

src/components/grid-row/grid-row.scss

src/components/grid-row/grid-row.tsx

src/components/icon/readme.md

src/components/link-box/link-box.scss

src/components/link-box/link-box.spec.tsx

src/components/link-box/link-box.tsx