style footer
merge changes