modify in file2.txt
Merge branch 'hotfix'