Fix merge conflicts.

diff --cc scss/foundation/components/_forms.scss
index 5476fcf012aec663442be2459e032e1a9e7bf779,da4e2e4c1398e5b7b51f201515ffa0d80a367b1a..98372670a63095eb2a9ea973b1d30228ce263b09
--- 1/scss/foundation/components/_forms.scss
--- 2/scss/foundation/components/_forms.scss
+++ b/scss/foundation/components/_forms.scss
@@@ -392,11 -407,13 +392,16 @@@ $select-hover-bg-color: scale-color($se
        @if not $input-include-glowing-effect {
            @include single-transition(all, 0.15s, linear);
        }
 +      &.radius {
 +        @include radius($input-border-radius);
 +      }
      }
 -    
+     
+     /* Respect enforced amount of rows for textarea */
+     textarea[rows] {
+       height: auto;
+     }
 +
      /* Add height value for select elements to match text input height */
      select {
        height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));