chore: Merge support into master

[alanbsmith]

This pull request was automatically created by an automated forward-merge job. The automated job failed automated checks and must be resolved manually.
Reasons for failure may include:

• Merge conflicts that cannot be automatically resolved
• A merge resulted in check failures
  • Lint or type errors
  • Test failures
  • Unexpected visual changes
    The pull request should inform you of merge conflicts before you start if any.

1. Run the following commands in your terminal. If this succeeds, skip step 2. The last command will run a script that tries to merge and resolve conflicts automatically.

   git branch -D merge/support-into-master || true
   git fetch upstream
   git checkout --track upstream/merge/support-into-master
   git pull upstream merge/support-into-master -f
   git pull upstream support
   node utils/forward-merge.js
   

2. If the previous step succeeded, skip to step 4.
3. Resolve conflicts manually. Then run the following.

   git add .
   git commit -m "chore: Merge support into master"
   

4. Push the merge commit back to the pull request

   git push upstream merge/support-into-master
   

If there were no merge conflicts, the forward-merge job failed because of a test failure. You can wait for the pull request to give errors, or you can check the logs for failures. You'll have to update code to fix errors.
This pull request will be merged using the merge strategy instead of the squash strategy. This means any commit in the log will show in the branch's history. Any commit you make should amend the merge commit. Use the following command:

git commit --amend --no-edit

You must then force-push the branch and the CI will rerun verification.
Use the automerge label like normal and the CI will pick the correct merge strategy.

[cypress]

---

Test summary

1001 • 0 • 3 • 0 • 0

---

Run details

Project	Workday/canvas-kit
Status	Passed
Commit	174b3c5 ℹ️
Started	Aug 19, 2024 7:18 PM
Ended	Aug 19, 2024 7:23 PM
Duration	05:19 💡
OS	Linux Ubuntu - 22.04
Browser	Electron 94

View run in Cypress Cloud ➡️

---

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Cloud

fix merge conflict