add a dummy footer
merge conflicts in main.css