fix merchandise
#1 fix merchandise position #2 add footer
fix conflict