merge lastest oh-my-zsh