Started migration to require
Migrated merge-types