Typically, if I have a migration that I need to edit before I merge, I'll just rollback, fix the migration, then remigrate instead of adding new migration files. It's much easier to see what happened later if it's all in one file.