created footer
resolved conflict