Applying: fix workaround for revision validation bug
Using index info to reconstruct a base tree...
M	.spelling
M	content/en/docs/setup/upgrade/canary/index.md
Falling back to patching base and 3-way merge...
Auto-merging content/en/docs/setup/upgrade/canary/index.md
CONFLICT (content): Merge conflict in content/en/docs/setup/upgrade/canary/index.md
Auto-merging .spelling
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix workaround for revision validation bug
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".