added footer
fixed conflicts