Added to hello world message
Fixed merge conflicts