change home.css
fixed merge conflict