css
deleting api
merge conflicts in css