BSB-35 - the footer is not static on the bottom
fixing merge errors