[Pharo-dev] [Pharo 7.0-dev] Build #715: 21579-Improving-the-handling-of-conflicts-in-Traits