Update test.txt
delete a line
fix conflict
I hava fixed the conflict and added one more line
Merge branch 'master' of git@github.com:zisenz/test.git

Conflicts:
	test.txt
fix test
Update test.txt
this is the second conflict
Merge branch 'master' of git@github.com:zisenz/test.git

Conflicts:
	test.txt
Update test.txt
This is the third conflict
Merge branch 'master' of git@github.com:zisenz/test.git

Conflicts:
	test.txt
Update test.txt
this is the fourth conflict..
Merge branch 'master' of git@github.com:zisenz/test.git

Conflicts:
	test.txt
Update test.txt
added a new line in branch test/0.0.2
memrg from branch test/0.0.2
added a second new line
native conflict 1