Hello World App
Fixed merge conflict