diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index 9eb9292..911c2f3 100644
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -1889,13 +1889,8 @@ select {
   --tw-bg-opacity: 0.8;
 }
 
-<<<<<<<<< Temporary merge branch 1
-.bg-opacity-100 {
-  --tw-bg-opacity: 1;
-=========
 .bg-none {
   background-image: none;
->>>>>>>>> Temporary merge branch 2
 }
 
 .fill-gray-500 {
@@ -3462,24 +3457,6 @@ select {
     padding-right: 2rem;
   }
 
-<<<<<<<<< Temporary merge branch 1
-  .lg\:px-6 {
-    padding-left: 1.5rem;
-    padding-right: 1.5rem;
-  }
-
-  .lg\:py-6 {
-    padding-top: 1.5rem;
-    padding-bottom: 1.5rem;
-  }
-
-  .lg\:text-3xl {
-    font-size: 1.875rem;
-    line-height: 2.25rem;
-  }
-
-=========
->>>>>>>>> Temporary merge branch 2
   .lg\:text-xs {
     font-size: 0.75rem;
     line-height: 1rem;