adding css
hopefully fixing
more merge conflict