style update in css
resolving merge conflict