fixed the merge conflicts in CSS and the partials