Non-conflicting merge
a commit
Merge branch 'a' into b

Conflicts:
	lj