moved hello to HelloWorld, resolved merge conflicts