Updated next event date
fixed merge conflict