added junk.txt second time
merging hello into goodbye