Applying: set priority in default envoyFilters to -1
Using index info to reconstruct a base tree...
M	manifests/charts/istio-control/istio-discovery/files/gen-istio.yaml
A	manifests/charts/istio-control/istio-discovery/templates/telemetryv2_1.15.yaml
A	manifests/charts/istiod-remote/templates/telemetryv2_1.15.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): manifests/charts/istiod-remote/templates/telemetryv2_1.15.yaml deleted in HEAD and modified in set priority in default envoyFilters to -1. Version set priority in default envoyFilters to -1 of manifests/charts/istiod-remote/templates/telemetryv2_1.15.yaml left in tree.
CONFLICT (modify/delete): manifests/charts/istio-control/istio-discovery/templates/telemetryv2_1.15.yaml deleted in HEAD and modified in set priority in default envoyFilters to -1. Version set priority in default envoyFilters to -1 of manifests/charts/istio-control/istio-discovery/templates/telemetryv2_1.15.yaml left in tree.
Auto-merging manifests/charts/istio-control/istio-discovery/files/gen-istio.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-control/istio-discovery/files/gen-istio.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 set priority in default envoyFilters to -1
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".