fixed merge conflicts in footer
fixed merge errors