resolves conflicts and adds top-offset-variable

src/client/components/forms/DraggableSection/ActionPanel/index.scss

@@ -5,38 +5,6 @@
     z-index: $z-nav;
   }
 
-<<<<<<< Updated upstream
-  &__controls-container {
-    position: relative;
-    height: 100%;
-  }
-
-  &__controls {
-    display: flex;
-    justify-content: center;
-    height: 100%;
-    flex-direction: column;
-    color: $color-gray;
-    opacity: 0;
-    visibility: hidden;
-  }
-
-  &--vertical-alignment-top {
-    .action-panel__controls {
-      justify-content: flex-start;
-    }
-  }
-
-  &--vertical-alignment-sticky {
-    .action-panel__controls {
-      position: sticky;
-      top: 120px;
-      height: unset;
-    }
-  }
-
-=======
->>>>>>> Stashed changes
   &__remove-row {
     margin: 0 0 base(.3);
   }

src/client/components/forms/DraggableSection/PositionPanel/index.scss

@@ -1,40 +1,6 @@
 @import '../../../../scss/styles';
 
 .position-panel {
-<<<<<<< Updated upstream
-  padding-right: base(1);
-  margin-bottom: base(1);
-
-  &__controls-container {
-    position: relative;
-    min-height: 100%;
-    box-shadow: #{$style-stroke-width-s} 0px 0px 0px $color-light-gray;
-  }
-
-  &__controls {
-    padding-right: base(.65);
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    height: 100%;
-  }
-
-  &--vertical-alignment-top {
-    .position-panel__controls {
-      justify-content: flex-start;
-    }
-  }
-
-  &--vertical-alignment-sticky {
-    .position-panel__controls {
-      position: sticky;
-      top: 120px;
-      height: unset;
-    }
-  }
-
-=======
->>>>>>> Stashed changes
   &__move-backward {
     transform: rotate(.5turn);
     margin: 0;

src/client/scss/vars.scss

@@ -54,6 +54,12 @@ $style-stroke-width : 1px;
 $style-stroke-width-s : 1px;
 $style-stroke-width-m : 2px;
 
+
+//////////////////////////////
+// MISC
+//////////////////////////////
+$top-header-offset: 120px;
+
 //////////////////////////////
 // SHADOWS
 //////////////////////////////