chore: resolve merge conflicts with main

Keep patched versions of okta.go and mailchimp.go that include the
Codex fixes (activate param and upsert endpoint) over the originals
that merged from PR #147.

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

Author: 2 people