Update HelloWorld.java

conflicting changes