競合した場合のチェック
Merge branch 'master' of https://github.com/BorzoiBros/monkeytutorial

Conflicts:
	sample.txt