fix for bad conflict resolution css.php