add fmt.Println("Hello golanger")
handle confict
update hello.go
Merge branch 'master' into develop