fixed event form
fixed merge issues