fix merge carlendar