Added upcoming event date
Fixed merge conflict