Fixed merge issue on hello.txt