remove old gocode
add new gocode
merge