upate: .no-sidebar separated into .no-sidebar + .with-padding

src/styles/base/main.scss

@@ -154,17 +154,6 @@ h5 {
   font-size: 2rem;
 }
 
-<<<<<<< HEAD
-%padding-main {
-  padding: 1.3rem;
-}
-
-%padding-block {
-  padding: 3.2rem;
-}
-
-=======
->>>>>>> d9b2c89... update: flex class added in other files + %padding removed
 .avatar {
   align-items: center;
   background-color: var(--color-avatar-background);

src/styles/components/sidebar.scss

 .no-sidebar {
   flex: 1;
-<<<<<<< HEAD
 
   &.with-padding {
-    @extend %padding-main;
+    padding: 1.3rem;
   }
-=======
-  padding: 5rem;
->>>>>>> d9b2c89... update: flex class added in other files + %padding removed
 }
 
 .with-sidebar {