Update scss.
Fix merge conflicts.