this is newBranch

Signed-off-by: USER <USER@email.com>
Merge branch 'newBranch'

Conflicts:
	test.txt