競合状態でpush original側
Merge branch 'master' of github.com:shodoi/test

Conflicts:
	index.html