changes in events tab
merge conflict resolved