create event
Fixed conflicts
Fixed messed up things