[zsh] resolve merge conflict