adds footer
fixes merge conflict