update: merge conflict resolved + fixes

src/styles/about/_index.scss

@@ -1,9 +1,5 @@
 #about {
 
-  p {
-    line-height: 22px;
-  }
-
   >div>div>div {
     min-height: 285px;
   }

src/styles/content/_index.scss

@@ -166,3 +166,11 @@ main {
     border: 3px solid white;                  /* creates padding around scroll thumb */
   }
 }
+
+
+solid-display-value-markdown {
+  
+  p {
+    margin: 0;
+  }
+}

src/styles/index.scss

@@ -32,21 +32,6 @@ solid-display>div {
 
 
 
-
-
-/* Job-offers */
-.job-edit {
-  position: absolute;
-  right: 20px;
-  top: 20px;
-}
-
-.padding-very-xxlarge {
-  padding-left: 135px;
-  padding-right: 135px;
-}
-
-
 $small: "max-width: 768px";
 
 .segment {
@@ -121,13 +106,6 @@ $small: "max-width: 768px";
   }
 }
 
-/* Converse */
-@media (max-width: 767.98px) {
-  #conversejs .converse-chatboxes .chatbox .box-flyout {
-    width: 100% !important;
-  }
-}
-
 
 
 @import 'header/_index';

src/styles/job-offers/_index.scss

@@ -1,4 +1,4 @@
-#job-offers>div:first-of-type {
+#job-offers #job-offers-board {
   min-height: calc(100vh - 72px);
 
   @media (max-width: 768px) {