Applying: Fix telemetry templates
Using index info to reconstruct a base tree...
A	manifests/charts/istio-control/istio-discovery/templates/telemetryv2_1.20.yaml
A	manifests/charts/istio-control/istio-discovery/templates/telemetryv2_1.21.yaml
A	manifests/charts/istiod-remote/templates/telemetryv2_1.20.yaml
A	manifests/charts/istiod-remote/templates/telemetryv2_1.21.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/charts/istiod-remote/templates/telemetryv2_1.17.yaml
Auto-merging manifests/charts/istiod-remote/templates/telemetryv2_1.16.yaml
CONFLICT (content): Merge conflict in manifests/charts/istiod-remote/templates/telemetryv2_1.16.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/templates/telemetryv2_1.17.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/templates/telemetryv2_1.16.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-control/istio-discovery/templates/telemetryv2_1.16.yaml
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 telemetry templates
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".