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