fixed merge conflict which removed banner