chiark / gitweb /
rework merging/loading logic