conflict resolved

diff --cc scss/mixins/_gradient.scss
index d8c2187,fd03ab6..d7b67cb
--- 1/scss/mixins/_gradient.scss
--- 2/scss/mixins/_gradient.scss
+++ b/scss/mixins/_gradient.scss
@@@ -7,5 -7,5 +7,5 @@@
      background: -webkit-gradient(linear, left top, left bottom, color-stop(0.05, $from), color-stop(1, $to));
      background: -moz-linear-gradient(center top, $from 5%, $to 100%);
      background: -ms-linear-gradient(center top, $from 5%, $to 100%);
-     filter: progid:DXIm-ageTransform.Microsoft.gradient(startColorstr='#{$from}', endColorstr'#{$to}');
- }
+     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$from}', endColorstr'#{$to}');
 -}
++}