change the footer
Resolve conflict