New files@
fixed footer
fix conflicts