Migrating token classes to a separated module
Resolving merge conflicts