created footer
merged branch footer, resolved conflict