fix merge conflicts

diff --cc scss/grid/_grid.scss
index ca539ca1891fd11bb2d44e7b59f3d35cd4fe61e8,b74a5589c4af1fdb013fd0f49253a57fada6b77b..ef174298b05da76fd8369172439765b2f227a977
--- 1/scss/grid/_grid.scss
--- 2/scss/grid/_grid.scss
+++ b/scss/grid/_grid.scss
@@@ -16,15 -16,11 +16,11 @@@ $wrapper-padding-top: 10px !default
  
  /// Default padding for the bottom of a column.
  /// @type Number
 -$column-padding-bottom: 10px !default;
 +$column-padding-bottom: 16px !default;
  
- /// Default gutter for the grid system
- /// @type Number
- $grid-column-gutter: 16px !default;
- 
  /// Default padding for the right of a sub-column.
  /// @type Number
- $sub-column-padding-right: $grid-column-gutter / 2 !default;
+ $sub-column-padding-right: $global-gutter / 2 !default;
  
  /// Body background color.
  /// @type Length

diff --cc testing/src/assets/scss/_settings.scss
Simple merge