solved merge with main

src/assets/scss/modules/_header.scss

@@ -6,11 +6,6 @@
       @include flex-align(left, middle);
       padding: $global-padding*2;
     }
-<<<<<<< HEAD
-   menu {
-    justify-self: end;
-   }
-=======
     nav {
       @include xy-cell(auto);
       @include flex;
@@ -22,7 +17,6 @@
         }
       }
     }
->>>>>>> dev
   }
 @include breakpoint(small){
 }