Fixed merge conflict with app.css.scss