One more change to hello.txt
Resolved conflict