addad another file
file1.txt changed
file1 updated after merge
file1 is now corrected