Committed to branch conflicting print
Merge branch 'master' into Br1

Conflicts:
	test.py
Merge branch 'Br1'

Conflicts:
	test32.py