自定义Zsh+哦,我的Zsh,但无法获得更新

我是一个新手与Zsh+哦,我的Zsh和我的提示设置为随机选择几个主题。

ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "kafeitu" "avit")

这样做的一个副作用是,当我被提示更新Zsh时,我不能:

[oh-my-zsh] Would you like to update? [Y/n] Y
Updating Oh My Zsh
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
There was an error updating. Try again later?

我怎样才能有定制的主题,仍然保持回购,以便我可以下拉更新?

谢谢。