adjusting conflict detection feature