Remove unneeded banners
Merge conflicts