Manual cherrypick required.
#2978 failed to apply on top of branch "release-3.1":
Applying: fix: change etcd to 3.5.24
Using index info to reconstruct a base tree...
M cmd/kk/apis/kubekey/v1alpha2/default.go
M version/components.json
Falling back to patching base and 3-way merge...
Auto-merging version/components.json
CONFLICT (content): Merge conflict in version/components.json
Auto-merging cmd/kk/apis/kubekey/v1alpha2/default.go
CONFLICT (content): Merge conflict in cmd/kk/apis/kubekey/v1alpha2/default.go
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: change etcd to 3.5.24
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".
Manual cherrypick required.
#2978 failed to apply on top of branch "release-3.1":