Fix of huge bug in conflict detection