adding event details option
merge conflicts