Revert "Fix Conflict"

This reverts commit 011c426db29a8fd976ce16bbef840a073b404ac6.
Create Event