Update Css style
Merge conflict