Delete Event
Fix merge conflicts