Fixing conflict in base.css