Small changes to Archivist so it uses the new delta merging