diff --git a/src/components/homepage/HeroBanner.astro b/src/components/homepage/HeroBanner.astro
index 5e03184..d288c89 100644
--- a/src/components/homepage/HeroBanner.astro
+++ b/src/components/homepage/HeroBanner.astro
@@ -9,11 +9,7 @@ import DownloadMuseHubButton from "../button/DownloadMuseHubButton";
     class="max-w-screen-sm md:max-w-screen-lg mx-auto py-12 grid grid-cols-12 gap-y-6"
   >
     <div class="flex flex-col gap-2 col-start-2 col-span-10 items-center text-center">
-<<<<<<< HEAD
-      <img alt="Audacity logo" class="w-12 md:w-16 lg:w-24" src={Audacity_Logo.src} />
-=======
       <img class="w-12 md:w-16 lg:w-24" src={Audacity_Logo.src} />
->>>>>>> 25a8da8e9ef6a117704cc81cae30a6979495fe79
       <h1>
         Audacity, the world's most popular audio editing and recording app
       </h1>
diff --git a/src/components/homepage/RecordAnything.astro b/src/components/homepage/RecordAnything.astro
index 03d5348..45eca33 100644
--- a/src/components/homepage/RecordAnything.astro
+++ b/src/components/homepage/RecordAnything.astro
@@ -23,11 +23,7 @@ import RecordCursor from "../../assets/img/RecordCursor.png";
     >
       <div class="relative col-span-6 h-48">
         <div class="absolute -right-7 top-28 md:top-28 h-16 w-64 md:w-72">
-<<<<<<< HEAD
-          <img alt="Decorative image of the Audacity transport toolbar" class="object-fit rounded-lg" src={TransportTools} />
-=======
           <img class="object-fit rounded-lg" src={TransportTools.src} />
->>>>>>> 25a8da8e9ef6a117704cc81cae30a6979495fe79
         </div>
         <img
           alt="Woman sitting at a desk with a microphone in front of her."
@@ -37,21 +33,12 @@ import RecordCursor from "../../assets/img/RecordCursor.png";
       </div>
       <div class="relative row-start-2 col-span-3 hidden xl:block h-48">
         <div class="absolute -right-3 bottom-0">
-<<<<<<< HEAD
-          <img alt="Decorative image of the Audacity record cursor" class="w-full h-52 object-cover" src={RecordCursor} />
-        </div>
-        <img alt="Image of an Audacity stereo waveform" class="h-full w-full rounded-lg" src={Waveform} />
-      </div>
-      <div class="row-start-2 col-span-3 h-48 hidden xl:block">
-        <img alt="Image of a woman sat on a bed playing a keyboard whilst holding a guitar" class="h-full w-full rounded-lg" src={RecordAnything2} />
-=======
           <img class="w-full h-52 object-cover" src={RecordCursor.src} />
         </div>
         <img class="h-full w-full rounded-lg" src={Waveform.src} />
       </div>
       <div class="row-start-2 col-span-3 h-48 hidden xl:block">
         <img class="h-full w-full rounded-lg" src={RecordAnything2.src} />
->>>>>>> 25a8da8e9ef6a117704cc81cae30a6979495fe79
       </div>
     </div>
   </div>