After merge one branch

test2.txt
Changes in test.txt