fix up the css merge