br1:a=1
br2: 2=1
Merge branch 'br2'

Conflicts:
	test