commit in new branch
Merge branch 'new-branch'

Conflicts:
	test.txt