expect a conflict

expect a conflict text
Merge remote-tracking branch 'origin/master'

Conflicts:
	touch.txt
Merge branch 'master' of https://github.com/hirokazunakajima/history

Conflicts:
	touch.txt