コンフリクトについてです。
Merge branch 'master' of https://github.com/shunwitter/GitTutorial
Merge branch 'master' of https://github.com/shunwitter/GitTutorial

Conflicts:
	sample.txt