Add gopath
Merge