Conflict test
Merge done
Merge branch 'master' of https://github.com/ohsugi/tutorial

Conflicts:
	sample.txt