added merge.txt
changed some text in merge.txt
deleted everything in merge.txt