9 com: 2.txt was changed in b:new1
10 com: 2.txt was changed in b:master
11 com: merging master and new1

Conflicts:
	2.txt