add hello.txt
merge with no-ff
shg