fixed conflicts

src/components/widgets/Hero.astro

@@ -6,6 +6,7 @@ import type { CallToAction } from '~/types';
 export interface Props {
   id?: string;
   title?: string;
+  title2?: string;
   subtitle?: string;
   tagline?: string;
   content?: string;
@@ -16,6 +17,7 @@ export interface Props {
 const {
   id,
   title = await Astro.slots.render('title'),
+  title2 = await Astro.slots.render('title2'),
   subtitle = await Astro.slots.render('subtitle'),
   tagline,
   content = await Astro.slots.render('content'),
@@ -46,6 +48,14 @@ const {
             />
           )
         }
+        {
+          title2 && (
+            <h3
+              class="text-5xl md:text-4xl font-bold leading-tighter tracking-tighter mb-4 font-heading dark:text-gray-200"
+              set:html={title2}
+            />
+          )
+        }
         <div class="max-w-3xl mx-auto">
           {subtitle && <p class="text-xl text-muted mb-6 dark:text-slate-300" set:html={subtitle} />}
           {

src/components/widgets/Note.astro

@@ -5,7 +5,7 @@ import { Icon } from 'astro-icon/components';
 <section class="bg-blue-50 dark:bg-slate-800 not-prose">
   <div class="max-w-6xl mx-auto px-4 sm:px-6 py-4 text-md text-center font-medium">
     <span class="font-bold">
-      <Icon name="tabler:info-square" class="w-5 h-5 inline-block align-text-bottom" /> Project Internet Capacity:</span
+      <Icon name="tabler:info-square" class="w-5 h-5 inline-block align-text-bottom" /> INCA:</span
     > The Internet as intended
   </div>
 </section>