branch
 branch 2nd change
Merge branch 'b_new'

Conflicts:
	NewTextDocument.txt