css fixed
db
finished
conflict fixed
delete conflict
ready for push