deleted hello.txt
merge.txt added