anchor.diff:  %% @private
   -spec resolve_manifests(atom(), atom(), term(), term()) -> term().
   resolve_manifests(writing, writing, A, B) ->
  -    BlocksWritten = resolve_written_blocks(A, B),
  -    LastWritten = resolve_last_written(A, B),
  -    NewMani1 = riak_moss_lfs_utils:update_blocks(A, BlocksWritten),
  -    riak_moss_lfs_utils:update_last_block_written_time(NewMani1, LastWritten);
  +    WriteBlocksRemaining = resolve_written_blocks(A, B),
  +    LastBlockWrittenTime = resolve_last_written_time(A, B),
  +    A#lfs_manifest_v2{write_blocks_remaining=WriteBlocksRemaining, last_block_written_time=LastBlockWrittenTime};
   
   resolve_manifests(writing, active, _A, B) -> B;
   resolve_manifests(writing, pending_delete, _A, B) -> B;
  
positive.code: %% @private
  -spec resolve_manifests(term(), term()) -> term().
  resolve_manifests(A, B) ->
      AState = riak_moss_lfs_utils:manifest_state(A),
      BState = riak_moss_lfs_utils:manifest_state(B),
      resolve_manifests(AState, BState, A, B).
  
  %% @doc Return a new, resolved manifest.
  
negative.code: 
  resolve_manifests(pending_delete, pending_delete, A, B) ->
      BlocksLeftToDelete = resolve_deleted_blocks(A, B),
      LastDeletedTime = resolve_last_deleted_time(A, B),
      A#lfs_manifest_v2{delete_blocks_remaining=BlocksLeftToDelete, last_block_deleted_time=LastDeletedTime};
  resolve_manifests(pending_delete, deleted, _A, B) -> B;
  
  resolve_manifests(deleted, deleted, A, A) -> A;
  