blabla.txt 3
blabla2.txt 2
Merge branch 'master' into b3

Conflicts:
	blabla.txt
Merge branch 'b3'