line 2
stu
Merge branch 'stu' of https://github.com/tpdi/test into stu

Conflicts:
	test.txt