Adding conflict detection for events