Fix merge conflicts

Author: clytaemnestra

src/components/sections/hero/hero.astro

@@ -47,7 +47,7 @@ const action2 = "https://www.youtube.com/watch?v=laSzm-raS5A";
     <!-- Second 2x1 Grid with Action Buttons -->
     <div class="text-center grid grid-cols-1 md:grid-cols-2 gap-4 m-6">
       <div class="btn-outline">
-        <Button outline url="https://europython.eu/tickets" class="!text-white !border-white hover:!bg-white hover:!text-primary"> Get your ticket </Button>
+        <Button outline url="/tickets" class="!text-white !border-white hover:!bg-white hover:!text-primary"> tickets </Button>
       </div>
       <div class="btn-outline">
         <Button outline url={action2} class="!text-white !border-white hover:!bg-white hover:!text-primary"> Watch the video (no Rickrolls) </Button>

src/components/ticket-tiers/ticket-tiers.astro

@@ -128,9 +128,6 @@ const tiers: TicketTierProps[] = [
   businessPrice: 150,
   subtitle: "Conference days only",
   features: [
-    {
-      text: "Remote participation for Conference Days (15-17 July)",
-    },
     {
       text: "Watch live talks, keynotes & panels in all 6 tracks",
     },

src/content/deadlines/04_tickets.md

@@ -0,0 +1,8 @@
+---
+title: Ticket Sale 
+subtitle: Register now! 
+url: /tickets
+image: "./registration.jpg"
+---
+
+Grab your spot at EuroPython 2026. Share, learn, and connect with fellow Pythonistas!