updated handling of flavour conflicts
updated definition of parton-based jet flavour