merge added base.css