resolve conflicts

src/index.css

@@ -48,7 +48,7 @@ body {
 }
 
 
-.glassCard {
+/*.glassCard {
   width: 100%;
   height: fit-content;
   background: rgba(255, 255, 255, 0.65);
@@ -63,7 +63,7 @@ body {
           inset 0 0 8px 4px rgba(255, 255, 255, 0.4);
   position: relative;
   overflow: hidden;
-}
+}*/
 
 .glassBorder{
     border-radius: 20px;