new file:   testfile1
	new file:   testfile2
	testfile1~
	testfile1~
Merge branch 'experimental'

Conflicts:
	testfile1

	testfile1~