modals
Fixed merge conflict in CSS file