fixes merge conflicts from refs #15988

themes/fid_adlr/scss/_customMixins.scss

@@ -31,7 +31,7 @@
   }
 }
 
-@mixin default-background-header {
+@mixin default-background{
   background-image: url('../images/background-shape-small.png'); /* fallback */
   background-image: url('../images/background-shape-small-mirrored.svg'), linear-gradient($midnight, $midnight); /* W3C */
   background-position: 100% 20%;

themes/fid_adlr/scss/compiled.scss

@@ -28,7 +28,7 @@
 //    '$screen-xs-max' = $screen-sm-min - 1 etc
 //    you can use '$screen-xs-max', '$screen-sm-max' and '$screen-md-max'
 // 3. Import finc's compiled.scss to have the variables and mixins defined above applied to it
-@import '../../finc/scss/compiled';
+@import '../../fid/scss/compiled';
 
 // 4. Customize further -- pls. comment and explain
 //    PLEASE ORGANIZE YOUR CSS ACCORDING TO THIS GENERAL RULE - keep exceptions to a minimum