temp fix for findconflict3