Update test2.txt
Delete test1.txt
Update test2.txt
Update test2.txt
update test2
Merge branch 'tempA'
tset