Correct syntax in css
Fix html syntax error
fix html
resolved conflicts