chore: resolve merge conflicts — keep nats-scheduling-fix changes

All conflicts were between the fixed scheduling implementation on this
branch and the old broken Nats-Next-Deliver-Time code from the merge
source. Resolved every conflict by accepting the nats-scheduling-fix
(HEAD) version in full.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: sonus21