no message
no message
asdf
Merge branch 'issue3'

Conflicts:
	sample.txt
no message