a 2 change
Merge branch 'B' into A

Conflicts:
	file
a c3
Merge branch 'A'

Conflicts:
	file