fix footer
merge dev