9d56683e8b
Fixed merge conflict with /docs/reference/command-line-tools-reference/kube-apiserver.md and preferred master