fixed db/migration files broken in auto-merge