commit 3
no message
Merge branch 'newBranch'

Conflicts:
	source/test.txt