css added
Fixed merge conflicts