ICAL: add conflict handling