Removed merge conflict in _snap.scss.