edit query
merge carlendar