Fix merge error on style.scss