footer added
fix conflict
background white
fix conflict