sample3.txt first commit
branch5 first commit
branch6 first commit
branch6 2nd commit
master 2nd commit
branch5 2nd commit
Merge branch 'branch5'

Conflicts:
	sample3.txt