fixed event page
fix merge conflict