added the hello world function
fixed merge conflict