edited footer
merge