ZSH: problème git

.zshrc

@@ -68,11 +68,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-<<<<<<< HEAD
-plugins=(git httpie ng npm nvm pass pip pyenv sudo virtualenvwrapper wd)
-=======
 plugins=(git httpie ng npm nvm pass pip pyenv sudo wd)
->>>>>>> 3be7111b37ae91585798c3e046fc8cf9f9cceb0e
 
 source $ZSH/oh-my-zsh.sh