edited file 1
Merge remote-tracking branch 'origin/dave-test-branch-2'
Merge remote-tracking branch 'origin/master'

Conflicts:
	file-for-test-branch.txt