change css
fixed merge conflicts
removed old file