[Backport conflict] Add a change that will conflict

[backport-action]

Description

Backport of #371 to conflict.

[backport-action]

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin conflict
git worktree add -d .worktree/backport-371-to-conflict origin/conflict
cd .worktree/backport-371-to-conflict
git switch backport-371-to-conflict
git reset --hard HEAD^
git cherry-pick -x 3457521675d7e3df2d432d600a3375fef09332d0
git push --force