Fixed merge conflicts in CSS file