Adding conflict detection