fixing up css
merge conflict