diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index 06951df..c62282c 100644
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -1889,13 +1889,8 @@ select {
   --tw-bg-opacity: 0.8;
 }
 
-<<<<<<< HEAD
-.bg-none {
-  background-image: none;
-=======
 .bg-opacity-100 {
   --tw-bg-opacity: 1;
->>>>>>> 28382959d66e99e037740e0f946d7fa2ff14e3f5
 }
 
 .fill-gray-500 {