update 1.txt
add 3.txt
test update 1.txt
test update 3.txt
master update 2.txt
master update 1.txt
Merge branch 'test'

Conflicts:
	1.txt
master update 2.txt
master update 1.txt
test update 1.txt
test update 3.txt
master update 1.txt -01
master update 2.txt -01
test update 1.txt
test update 3.txt -01
update 2.txt
add 4.txt
Merge branch 'master' of github.com:andycnzh/TestGit

Conflicts:
	1.txt
	3.txt
111
222