update fix.css cause merge problem