remove event today
conclude merge