modify test.py
Add
Merge branch 'b2'

Conflicts:
	test.py