diff --git a/src/components/themes/appletv/theme.css b/src/components/themes/appletv/theme.css
index c5c4f3ea50..a6e9888e12 100644
--- a/src/components/themes/appletv/theme.css
+++ b/src/components/themes/appletv/theme.css
@@ -26,16 +26,6 @@ html {
     background: linear-gradient(to right, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB)
 }
 
-<<<<<<< HEAD
-@supports (backdrop-filter:blur(1.5em)) {
-    .skinHeader-blurred {
-        background: linear-gradient(to right, rgba(188, 188, 188, .7), rgba(167, 180, 183, .7), rgba(190, 181, 165, .7), rgba(173, 190, 194, .7), rgba(185, 199, 203, .7));
-        backdrop-filter: blur(1.5em)
-    }
-}
-
-=======
->>>>>>> master
 .skinHeader.semiTransparent {
     backdrop-filter: none !important
 }
@@ -194,16 +184,6 @@ html {
     background: linear-gradient(to right, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB)
 }
 
-<<<<<<< HEAD
-@supports (backdrop-filter:blur(10px)) {
-    .appfooter-blurred {
-        background: rgba(24, 24, 24, .7);
-        backdrop-filter: blur(20px)
-    }
-}
-
-=======
->>>>>>> master
 .nowPlayingBarSecondaryText {
     color: #999
 }
diff --git a/src/components/themes/blueradiance/theme.css b/src/components/themes/blueradiance/theme.css
index 8204e0c972..dca6ab8104 100644
--- a/src/components/themes/blueradiance/theme.css
+++ b/src/components/themes/blueradiance/theme.css
@@ -175,11 +175,7 @@ html {
 
 @supports (backdrop-filter:blur(10px)) {
     .appfooter-blurred {
-<<<<<<< HEAD
-        background: rgba(24, 24, 24, .7);
-=======
         background: rgba(1, 2, 50, .7);
->>>>>>> master
         backdrop-filter: blur(20px)
     }
 }
diff --git a/src/components/themes/dark/theme.css b/src/components/themes/dark/theme.css
index 38c1005a6b..4012c0c7ee 100644
--- a/src/components/themes/dark/theme.css
+++ b/src/components/themes/dark/theme.css
@@ -161,16 +161,6 @@ html {
     color: rgba(255, 255, 255, .78)
 }
 
-<<<<<<< HEAD
-@supports (backdrop-filter:blur(10px)) {
-    .appfooter-blurred {
-        background: rgba(24, 24, 24, .7);
-        backdrop-filter: blur(20px)
-    }
-}
-
-=======
->>>>>>> master
 .itemSelectionPanel {
     border: 1px solid #00a4dc
 }
diff --git a/src/components/themes/emby/theme.css b/src/components/themes/emby/theme.css
index 886505f464..e78077c29b 100644
--- a/src/components/themes/emby/theme.css
+++ b/src/components/themes/emby/theme.css
@@ -161,16 +161,6 @@ html {
     color: rgba(255, 255, 255, .78)
 }
 
-<<<<<<< HEAD
-@supports (backdrop-filter:blur(10px)) {
-    .appfooter-blurred {
-        background: rgba(24, 24, 24, .7);
-        backdrop-filter: blur(20px)
-    }
-}
-
-=======
->>>>>>> master
 .itemSelectionPanel {
     border: 1px solid #52b54b
 }
diff --git a/src/components/themes/light/theme.css b/src/components/themes/light/theme.css
index cae5def58a..d330d2250d 100644
--- a/src/components/themes/light/theme.css
+++ b/src/components/themes/light/theme.css
@@ -186,16 +186,6 @@ html {
     color: rgba(255, 255, 255, .78)
 }
 
-<<<<<<< HEAD
-@supports (backdrop-filter:blur(10px)) {
-    .appfooter-blurred {
-        background: rgba(24, 24, 24, .7);
-        backdrop-filter: blur(20px)
-    }
-}
-
-=======
->>>>>>> master
 .nowPlayingBarSecondaryText {
     color: #999
 }
diff --git a/src/components/themes/purple-haze/theme.css b/src/components/themes/purple-haze/theme.css
index d55402731e..fe348217d8 100644
--- a/src/components/themes/purple-haze/theme.css
+++ b/src/components/themes/purple-haze/theme.css
@@ -263,11 +263,7 @@ a[data-role=button] {
 
 @supports (backdrop-filter:blur(10px)) {
     .appfooter-blurred {
-<<<<<<< HEAD
-        background: rgba(24, 24, 24, .7);
-=======
         background: rgba(6, 37, 111, .7);
->>>>>>> master
         backdrop-filter: blur(20px)
     }
 }
diff --git a/src/components/themes/wmc/theme.css b/src/components/themes/wmc/theme.css
index 792bd0db2f..cabb21ba97 100644
--- a/src/components/themes/wmc/theme.css
+++ b/src/components/themes/wmc/theme.css
@@ -26,16 +26,6 @@ html {
     background: linear-gradient(to bottom, #0C2450, #081B3B)
 }
 
-<<<<<<< HEAD
-@supports (backdrop-filter:blur(1.5em)) {
-    .skinHeader-blurred {
-        background: rgba(20, 20, 20, .7);
-        backdrop-filter: blur(1.5em)
-    }
-}
-
-=======
->>>>>>> master
 .skinHeader.semiTransparent {
     backdrop-filter: none !important;
     background-color: rgba(0, 0, 0, .3);
@@ -174,16 +164,6 @@ html {
     color: rgba(255, 255, 255, .78)
 }
 
-<<<<<<< HEAD
-@supports (backdrop-filter:blur(10px)) {
-    .appfooter-blurred {
-        background: rgba(24, 24, 24, .7);
-        backdrop-filter: blur(20px)
-    }
-}
-
-=======
->>>>>>> master
 .itemSelectionPanel {
     border: 1px solid #00a4dc
 }
diff --git a/src/css/librarybrowser.css b/src/css/librarybrowser.css
index ef71a4e192..1a41fe8015 100644
--- a/src/css/librarybrowser.css
+++ b/src/css/librarybrowser.css
@@ -406,10 +406,7 @@
 
 .detailImageContainer {
     width: 280px;
-<<<<<<< HEAD
-=======
     margin-right: 2em;
->>>>>>> master
     flex-shrink: 0;
 }