Update hello2.txt
conflict