[Vim/Zsh] Merged conflicts.