conflict disjoint added