[events] fix merging issues.