update test.txt local
merged text.txt