modifed test.txt
delete test.txt of git,add tag
conflict fixed of test.txt