add footer
header and footer
fixed conflicts