fixed hello.txt
fix the conflict
Revert "re-add "good morning""

This reverts commit ec95a5cc6a558da68f2060bb1afd8acdf9afbf03.
re-format text
re-format text