add when we subsample and have conflicts