body color in home css
footer css
merge conflict