changes
resolved css conflict