anchor.diff:      %% should this deleted date
       %% be different than the last block
       %% deleted date? I'm think yes, technically.
  -    LastDeleted = resolve_last_deleted(A, B),
  -    riak_moss_lfs_utils:update_last_deleted_time(A, LastDeleted).
  +    LastBlockDeletedTime = resolve_last_deleted_time(A, B),
  +    A#lfs_manifest_v2{last_block_deleted_time=LastBlockDeletedTime}.
   
   resolve_written_blocks(A, B) ->
  -    AWritten = riak_moss_lfs_utils:write_blocks_remaining(A),
  -    BWritten = riak_moss_lfs_utils:write_blocks_remaining(B),
  +    AWritten = A#lfs_manifest_v2.write_blocks_remaining,
  +    BWritten = B#lfs_manifest_v2.write_blocks_remaining,
       ordsets:intersection(AWritten, BWritten).
   
   resolve_deleted_blocks(A, B) ->
  -    ADeleted = riak_moss_lfs_utils:delete_blocks_remaining(A),
  -    BDeleted = riak_moss_lfs_utils:delete_blocks_remaining(B),
  +    ADeleted = A#lfs_manifest_v2.delete_blocks_remaining,
  +    BDeleted = B#lfs_manifest_v2.delete_blocks_remaining,
       ordsets:intersection(ADeleted, BDeleted).
   
  -resolve_last_written(A, B) ->
  -    ALastWritten = riak_moss_lfs_utils:last_block_written_time(A),
  -    BLastWritten = riak_moss_lfs_utils:last_block_written_time(B),
  +resolve_last_written_time(A, B) ->
  +    ALastWritten = A#lfs_manifest_v2.last_block_written_time,
  +    BLastWritten = B#lfs_manifest_v2.last_block_written_time,
       latest_date(ALastWritten, BLastWritten).
   
  -resolve_last_deleted(A, B) ->
  -    ALastDeleted = riak_moss_lfs_utils:last_block_deleted_time(A),
  -    BLastDeleted = riak_moss_lfs_utils:last_block_deleted_time(B),
  +resolve_last_deleted_time(A, B) ->
  +    ALastDeleted = A#lfs_manifest_v2.last_block_deleted_time,
  +    BLastDeleted = B#lfs_manifest_v2.last_block_deleted_time,
       latest_date(ALastDeleted, BLastDeleted).
   
   latest_date(A, B) when A > B -> A;
  
positive.code: 
  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);
  resolve_manifests(pending_delete, deleted, _A, B) -> B;
  
  resolve_manifests(deleted, deleted, A, A) -> A;
  
negative.code: %% @doc Module to resolve siblings with manifest records
  
  -module(riak_moss_manifest_resolution).
  
  -include("riak_moss.hrl").
  
  %% export Public API
  -export([resolve/1]).
  