diff --git a/src/pages/index.astro b/src/pages/index.astro
index bce3676..4bbfc56 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -53,19 +53,12 @@ const yearsSince = currentYear - fixedYear;
 
   <Hero
     id="hero"
-<<<<<<< HEAD
     title="Turning automation into action, one workflow at a time."
     actions={[{ variant: 'primary', text: 'Contact me', href: getPermalink('/contact#form') }]}
   >
-    <Fragment slot="subtitle">
-      <strong>Hi! I am Richard Bergsma</strong> </br>I streamline processes with Power Automate, build smart chatbots in Copilot Studio, and connect the dots with seamless API integrations—all while leveling up my Python skills.
-=======
-    title="Simplifying Systems, Amplifying Results"
     
-  >
     <Fragment slot="subtitle">
       <strong>Hi! I am Richard Bergsma</strong></br>I automate workflows with Power Automate, build smart chatbots in Copilot Studio, and connect systems through seamless API integrations. From optimizing IT infrastructure and managing global environments to enhancing collaboration with SharePoint and Azure, I streamline processes to make technology work smarter—all while leveling up my Python skills.
->>>>>>> 35c7b27 (Main page information updated)
     </Fragment>
     
   </Hero>