footer updates
merge