other one update the file test.txt

test the git conflict!