Merge conflict resolution of style css
Merge fix