Merge avp.zsh into voska.zsh.