Fixed CSS merging issue