(This is newBranch 2)
merge newBranch to master again.

Conflicts:
	test.txt