fix event selection
merge conflict