merge conflicts in app.scss... wasn't really but whatever git.