Generate model alongside migration.
Fixed merge conflict in model generator