Manually merged the EventDetail and UpdateEvent changes.