Resolved conflict in CSS file.