fixed merge issue
banner day