Applying: prow: update default image to 1.24.0
Applying: wait for token data to be available
Using index info to reconstruct a base tree...
M	istioctl/pkg/multicluster/remote_secret.go
Falling back to patching base and 3-way merge...
Auto-merging istioctl/pkg/multicluster/remote_secret.go
CONFLICT (content): Merge conflict in istioctl/pkg/multicluster/remote_secret.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 wait for token data to be available
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".