temp fix for findconflict4