updated handling of flavour conflicts