box-sizing mixin
fixed merge conflict