Fixed event date format
Merging