fix for merge conflict

diff --cc testing/src/assets/scss/_settings.scss
index ee95ad8494a017b41a1a7b6b3604f2216cbbaef1,466e67b9fb95c692cb79a30956992356c50ac816..8955d29bf959547bc252d63fd6d4a309a3acd797
--- 1/testing/src/assets/scss/_settings.scss
--- 2/testing/src/assets/scss/_settings.scss
+++ b/testing/src/assets/scss/_settings.scss
@@@ -42,9 -40,10 +42,13 @@@ $global-breakpoint: $global-width + $gl
  // -------
  
  $grid-column-count: 12;
 -$wrapper-padding-top: 10px;
  $column-padding-bottom: 16px;
  $sub-column-padding-right: $global-gutter / 2;
++<<<<<<< HEAD
 +$body-background: $light-gray;
++=======
+ $body-background-color: $light-gray;
++>>>>>>> 7a165d7b7ecc2c99b49b0b154c311f520c8a6b74
  
  // 3. Block Grid
  // -------------