temp fix for findconflict5