Update for Traits 4.3.0
resolve
Conflict resolve