The merge migration was using depends_on instead of down_revision, which prevented Alembic from recognizing it as a merge point.
Resolves conflict between numeric migration branch (0013) and tool-workshop migration branch (8ed7dd80973d) both depending on 0012_default_port_req.