branch1 first commit
fix test.md
Merge branch 'branch1'

Conflicts:
	testDir/test.md