add file2.txt
edit file1.txt
merge file1.txt