trait conflict resolution