fixes css
merge