changes in css
merged conflict