diff --git a/src/styles/tailwind.css b/src/styles/tailwind.css
index 64f9e28..ef2e3b1 100644
--- a/src/styles/tailwind.css
+++ b/src/styles/tailwind.css
@@ -309,8 +309,6 @@
     color: rgb(116, 0, 204); /* equivalent to 'text-cyan-700' */
 }
 
-<<<<<<< HEAD
-=======
 /* NEW STYLES */
 
 /* For text on a dark background */
@@ -433,4 +431,3 @@
 .btn-new:hover {
   background: radial-gradient(circle, #341a55 0%, #5e4589 100%); /* Reverse gradient on hover */
 }
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd