modify state
up
worke up
cause conflict
cause conflict 1
Merge branch 'master' of /home/nushio/heptacat-test/node-m/heptacat-example-record

Conflicts:
	state.txt
remove lines
remove lines
Merge branch 'master' of /home/nushio/heptacat-test/node-m/heptacat-example-record
conflict 2
merge
Merge branch 'master' of /home/nushio/heptacat-test/node-m/heptacat-example-record

Conflicts:
	state.txt
quk
Merge branch 'master' of /home/nushio/heptacat-test/node-m/heptacat-example-record
koware
Merge branch 'master' of /home/nushio/heptacat-test/node-m/heptacat-example-record

Conflicts:
	state.txt
supreme problem.
Merge github.com:sugoi/heptacat-example-record

Conflicts:
	state.txt