one more entry
extend the definition of conflicting traits
Merge pull request #5362 from illi-kun/conflict_traits

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