diff --git a/src/app/globals.css b/src/app/globals.css
index cfb4661..b413818 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -47,9 +47,15 @@
   --sidebar-accent-foreground: hsl(240 5.9% 10%);
   --sidebar-border: hsl(340 20% 90%);
   --sidebar-ring: hsl(217.2 91.2% 59.8%);
+<<<<<<< HEAD
   --sidebar: hsl(0 0% 98%);
 }
 
+=======
+}
+
+
+>>>>>>> 05fe03f7de2e18cbbcac3debb69cf94ff941255f
 .dark {
   --background: hsl(315 21% 8%);
   --foreground: hsl(0 0% 98%);
@@ -83,7 +89,10 @@
   --sidebar-accent-foreground: hsl(240 4.8% 95.9%);
   --sidebar-border: hsl(296, 18%, 15%);
   --sidebar-ring: hsl(217.2 91.2% 59.8%);
+<<<<<<< HEAD
   --sidebar: hsl(240 5.9% 10%);
+=======
+>>>>>>> 05fe03f7de2e18cbbcac3debb69cf94ff941255f
 }
 
 @theme inline {