Don't know what's this.
Fix merge error
Various fixes to zshrc.