Create file2
file1 has been modified
file1 has been modified
Merged