deleted a migration file, and merged