1111
11
111
aaaa
1aa
Merge branch 'B1' into B2

Conflicts:
	1.c