commit2
branchcommit3
Merge remote-tracking branch 'origin/newBranch'

Conflicts:
	someSourceFiles.txt