Remove merge conflicts from custom.css