fixed merge conflict in app.css