add stylesheet.css
added lines
solve conflict