nb1
nb2
nb3
Merge branch 'master' into new_branch

Conflicts:
	test.txt
Merge branch 'new_branch'