added my version to hello.txt
Fixed merged conflict