fixed creating a new event
merged conflicts