Footer markup
Merge conflicts