a commit
Merge branch 'a' into b

Conflicts:
	lj
a commit
Merge branch 'b' into a