Applying: Consistent namespace creation
Using index info to reconstruct a base tree...
M	pkg/test/framework/components/namespace/kube.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/test/framework/components/namespace/kube.go
CONFLICT (content): Merge conflict in pkg/test/framework/components/namespace/kube.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 Consistent namespace creation
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".