If you haven't committed either of these, and you are adding, then removing the same column, why not just remove the migration files?