merge
fixed syntax error in zshrc