Add a document for the conflict confirmation from Takahiro again.
Merge branch 'master' of https://github.com/TakahiroHayakawa/backoffice

Conflicts:
	pull_sourcetree.txt