fix: yaml with merge#1332

k8s-ci-robot merged 2 commits intokubernetes-client:masterkubernetes-client/csharp:masterfrom

IvanJosipovic:yaml-with-mergeIvanJosipovic/kubernetes-client-csharp:yaml-with-mergeCopy head branch name to clipboard