add go path
merge conflict