New scss components
Delete a missing "-<<<<<<< HEAD"