Remove merge conflict files
Bb version 1.0.33
Merge pull request #1178 from gannetson/feature/CLUB-253-news-in-footer

Feature/club 253 news in footer