[zsh] merge actually completed