changes in css
css conflit resolved