Post-merge rebuild of style.css and test/style.css