fix footer
fix conflict
Merge branch 'new_design'