Applying: Add tagged gateways to status
Using index info to reconstruct a base tree...
M	pilot/pkg/config/kube/crdclient/client.go
M	pkg/config/model.go
M	pkg/test/framework/components/ambient/waypoint.go
M	tests/integration/ambient/main_test.go
M	tests/integration/ambient/waypoint_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/integration/ambient/waypoint_test.go
CONFLICT (content): Merge conflict in tests/integration/ambient/waypoint_test.go
Auto-merging tests/integration/ambient/main_test.go
Auto-merging pkg/test/framework/components/ambient/waypoint.go
Auto-merging pkg/config/model.go
Auto-merging pilot/pkg/config/kube/crdclient/client.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Add tagged gateways to status