fix header and footer
resolve conflict in form