commit
commit
commit
Merge branch 'issue2' into issue1

Conflicts:
	sample.txt

commit