changed footer
fix merge