add delete function to events
fix merge conflict