merge with oh-my-zsh