add line from b1
add line from b12
Merge branch 'branch-1' into branch-2

Conflicts:
	New Text Document.txt