Fixes main.scss

Removes missed merge conflict info from main.scss