resolve conflicts

assets/css/aboutus.scss

@@ -6,7 +6,7 @@
   }
 }
 
-.lighter-banner{
+.lighter-banner {
   display: flex;
   flex-direction: column;
   text-align: center;
@@ -18,10 +18,10 @@
   background-blend-mode: multiply;
 
   .banner-img {
-      z-index: -1;
-      position: absolute;
-      width: 100vw;
-      height: 260px;
+    z-index: -1;
+    position: absolute;
+    width: 100vw;
+    height: 260px;
   }
 
 }
@@ -61,9 +61,6 @@
 
     img {
       width: 100vw;
-      height: auto;
-      padding: 0 20px;
-      border-radius: 8%;
     }
 
     .know-content {
@@ -206,15 +203,6 @@
       max-width: fit-content;
     }
 
-<<<<<<< feat/responsive-landing
-      .accordion-bx {
-        width: 75%;
-
-        @media(max-width: 810px) {
-          width: 60%;
-        }
-      }
-=======
   }
 
 }
@@ -230,11 +218,10 @@
     .phase-content {
       order: 1;
       width: 100%;
->>>>>>> main
     }
 
     img {
-      order: 2; 
+      order: 2;
       width: 100%;
     }
 
@@ -264,4 +251,4 @@
     height: 100%;
     z-index: -1;
   }
-}
+}

assets/css/get_in_touch.scss

@@ -81,7 +81,6 @@
     }
   }
 }
-<<<<<<< feat/responsive-landing
 
 @media (max-width: 767px) {
   .onde-nos-encontrar-wrapper {
@@ -134,6 +133,4 @@
       }
     }
   }
-}
-=======
->>>>>>> main
+}

assets/css/landing.scss

@@ -155,19 +155,12 @@
       list-style: none;
     }
 
-<<<<<<< feat/responsive-landing
     .glide__slide {
       @apply flex justify-center items-center;
       width: 100%;
       height: auto;
       max-height: 500px;
       transition: transform 0.25s ease-out;
-=======
-    p {
-      text-wrap: wrap;
-      margin-top: 0.5rem;
-      padding: 0 1rem 1.5rem 1rem;
->>>>>>> main
     }
 
     .glide__slide img {
@@ -599,4 +592,4 @@
   .nossas-equipes-container {
     width: 1360px;
   }
-}
+}