branch
branch
Merge branch 'master' into newBranch

Conflicts:
	test.txt