refixed cal with main event, was missing before
fixed conflicts