diff --git a/web/app/styles/globals.css b/web/app/styles/globals.css
index c76f8f51e9..8df48cc9e7 100644
--- a/web/app/styles/globals.css
+++ b/web/app/styles/globals.css
@@ -2,13 +2,8 @@
 @tailwind base;
 @tailwind components;
 
-<<<<<<< HEAD
-@import "../../themes/light.css";
-@import "../../themes/dark.css";
-=======
 @import '../../themes/light.css';
 @import '../../themes/dark.css';
->>>>>>> main
 @import "../../themes/manual-light.css";
 @import "../../themes/manual-dark.css";