Merge latest stuff and fix conflict

package.json

 {
   "name": "@itcenteratunihelsinki/huds-lib",
-  "version": "0.0.46",
+  "version": "0.0.48",
   "description": "Helsinki University Design System library",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

src/components/hy-key-figure-group/hy-key-figure-group.tsx

@@ -56,7 +56,7 @@ export class HyKeyFigureGroup implements ComponentInterface {
     const classRowCenteredAttributes = ['hy-key-figure-group', 'hy-key-figure-group-centered'].join(' ');
 
     if (this._dataItems.length % 5 == 0) {
-      return [
+      return (
         <Host>
           <div class={classAttributes}>
             <div class={classRowAttributes}>
@@ -89,8 +89,8 @@ export class HyKeyFigureGroup implements ComponentInterface {
             </div>
           </div>
           <hy-box pb="1.5, 2.5, 2.5" />
-        </Host>,
-      ];
+        </Host>
+      );
     } else {
       return (
         <Host>

src/components/hy-main/hy-main.scss

 .hy-main {
   display: flex;
   //margin: var(--gutter-mobile) auto;
+  margin: 0 auto;
   max-width: $fullhd;
   padding: 0;
   width: 100%;