d
e
Merge remote-tracking branch 'origin/2nd'

Conflicts:
	src/testdoc 1.txt