fix merge error after rebase

docs/tasks/tools/install-kubectl.md

@@ -187,12 +187,6 @@ kubectl completion bash > $(brew --prefix)/etc/bash_completion.d/kubectl
 
 The Homebrew project is independent from Kubernetes, so the bash-completion packages are not guaranteed to work.
 
-<<<<<<< HEAD
-### Using zsh
-
-To add kubectl autocompletion to your ZSH profile, add the following line to
-the ~/.zshrc file:
-=======
 ### Using Zsh
 If you are using zsh edit the ~/.zshrc file and add the following code to enable kubectl autocompletion:
 
@@ -203,7 +197,7 @@ fi
 ```
 
 Or when using [Oh-My-Zsh](http://ohmyz.sh/), edit the ~/.zshrc file and update the `plugins=` line to include the kubectl plugin.
->>>>>>> Update install-kubectl.md
+
 
 ```shell
 source <(kubectl completion zsh)