temp fix for findconflict