test bug branch
test merged bug
修复一下远端不接受的问题
resolve 2.txt becasue 2.txt is not in github
fix
Revert "hellogit"

This reverts commit d025e2e2c2feb658908c6018637ed903f284b1a0.

Conflicts:
	1.txt