Merge in app.css resolved