Extend the definition of conflicting traits, final fix for #5358