trying to ifxed creating evnet
fixed merge conflict