add b b
add a aa
Merge branch 'b'

Conflicts:
	a