测试一下文件的copy/paste
test3.c
add m_test1
add b_test
make a collosion
make a collison with branch
add
Merge branch 'brranch-1'

Conflicts:
	README.md