952a9f3234
The merge migration was using depends_on instead of down_revision, which prevented Alembic from recognizing it as a merge point.