fix migration command failing on first migration
Merge conflict fix