diff --git a/src/renderer/themes.css b/src/renderer/themes.css
index af0214f4..11db13d6 100644
--- a/src/renderer/themes.css
+++ b/src/renderer/themes.css
@@ -448,23 +448,25 @@ body {
   color: var(--primary-text-color);
   background-color: var(--bg-color);
 }
+
 a:link {
     color: var(--link-color);
 }
+
 a:visited {
     color: var(--link-visited-color);
 }
-<<<<<<< HEAD
+
 ::-webkit-scrollbar {
 	width: 10px;
 }
+
 ::-webkit-scrollbar-thumb {
   -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
   background: var(--scrollbar-color);
   border-radius: 10px;
 }
+
 ::-webkit-scrollbar-thumb:hover {
   background: var(--scrollbar-color-hover);
 }
-=======
->>>>>>> 9b9313d348ab019cb17ffb3478fe3c4c7b0292e5