Fixes conflicts where traits are used in base classes