added time to edit event
merged conflicts