adding -moz box sizing
strange conflict commit