updaten van events
merge branches