diff --git a/theme/modules/change-banner.css b/theme/modules/change-banner.css
index f58dcb6..ef4f326 100644
--- a/theme/modules/change-banner.css
+++ b/theme/modules/change-banner.css
@@ -9,11 +9,6 @@
 }
 
 .pageTitleWithDefaultLogo,
-<<<<<<< HEAD
 .pageTitleWithLogo {
-=======
-.pageTitleWithLogo,
-.splashLogo {
->>>>>>> 205270d576029208157855f7ee3fe0468c09e730
     background-image: var(--banner-url) !important;
 }
\ No newline at end of file