Update events
Resolved conflict