Add css
Fix merge conflict