update footer
updates
merge issue