Merge app.css with base.css