diff --git a/libs/ui/src/lib/logo-carousel/logo-carousel.component.scss b/libs/ui/src/lib/logo-carousel/logo-carousel.component.scss
index d763a3719..d85d12e9d 100644
--- a/libs/ui/src/lib/logo-carousel/logo-carousel.component.scss
+++ b/libs/ui/src/lib/logo-carousel/logo-carousel.component.scss
@@ -215,12 +215,9 @@
       &.logo-selfhostedhub,
       &.logo-sourceforge,
       &.logo-umbrel,
-<<<<<<< HEAD
       &.logo-unraid,
       &.logo-selfhostedhub{
-=======
       &.logo-unraid{
->>>>>>> 658a894d (changes added after review)
         background-color: rgba(var(--light-primary-text));
       }
     }