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"
>
-<<<<<<< HEAD
-

-=======

->>>>>>> 25a8da8e9ef6a117704cc81cae30a6979495fe79
Audacity, the world's most popular audio editing and recording app
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";
>
-<<<<<<< HEAD
-

-=======

->>>>>>> 25a8da8e9ef6a117704cc81cae30a6979495fe79
-<<<<<<< HEAD
-

-
-

-
-
-

-=======

->>>>>>> 25a8da8e9ef6a117704cc81cae30a6979495fe79