merging with event fixes
merging conflict resolved