Fix merge conflicts

package.json

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

src/components/hy-hero/hy-hero.tsx

@@ -65,7 +65,3 @@ export class HyHero {
     );
   }
 }
-
-/*
-<h1 class="hy-hero__title">{this.heading}</h1>
-*/