hi.txt - message added
Conflicts resolved