adding footer
fixed merge conflicts