Trait conflict resolution