Remove the conflict

diff --cc scss/foundation/components/_switches.scss
index bd818b2ee683a4176c5b3d950059e578eccfd8e0,45892111a52571cf62886b80ef43a2ad076a675d..51050ceed1c157dcf865967f662c310b6386c1f2
mode 100644,100755..100644
--- 1/scss/foundation/components/_switches.scss
--- 2/scss/foundation/components/_switches.scss
+++ b/scss/foundation/components/_switches.scss
@@@ -26,10 -26,10 +26,10 @@@ $switch-height-lrg: 2.5rem !default
  $switch-bottom-margin: 1.5rem !default;
  
  // We use these to style the switch-paddle
 -$switch-paddle-bg: #fff !default;
 +$switch-paddle-bg: $white !default;
  $switch-paddle-transition-speed: .15s !default;
  $switch-paddle-transition-ease: ease-out !default;
- $switch-active-color: $primary-color;
+ $switch-active-color: $primary-color !default;
  
  
  //