Fix merge conflicts in _snap.scss