Bug 11810: (followup) regenerate CSS due to conflict