anchor.diff:  
   resolve_manifests(pending_delete, pending_delete, A, B) ->
       BlocksLeftToDelete = resolve_deleted_blocks(A, B),
  -    LastDeletedTime = resolve_last_deleted(A, B),
  -    NewMani1 = riak_moss_lfs_utils:update_delete_blocks_remaining(A, BlocksLeftToDelete),
  -    riak_moss_lfs_utils:update_last_block_deleted_time(NewMani1, LastDeletedTime);
  +    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;
  
positive.code: %% @doc Module to resolve siblings with manifest records
  
  -module(riak_moss_manifest_resolution).
  
  %% export Public API
  -export([resolve/1]).
  
negative.code: %% @private
  -spec resolve_manifests(term(), term()) -> term().
  resolve_manifests(A, B) ->
      AState = A#lfs_manifest_v2.state,
      BState = B#lfs_manifest_v2.state,
      resolve_manifests(AState, BState, A, B).
  
  %% @doc Return a new, resolved manifest.
  