Fixed NOGOPATH
Fixed merge conflict
Fix .zshrc to support fedor and ubuntu