[FIX] resolve merge conflict in app.css