started changing css
fix merge conflict