FIX: wrong CSS after merging code