made cloned hello.txt
fixed merge conflict to the HEAD message