changed css
fixed merge conflicts
fix some conflicts