Update test-merge.txt