conflict
Merge branch 'newBranch'

Conflicts:
	test1