Resolved the main.scss conflicts.