Updated two files
Merged some_file.txt