anchor.diff:  %% @doc Module to resolve siblings with manifest records
   
   -module(riak_moss_manifest_resolution).
  +
  +-include("riak_moss.hrl").
   
   %% export Public API
   -export([resolve/1]).
  
positive.code:     %% 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).
  
  resolve_written_blocks(A, B) ->
      AWritten = riak_moss_lfs_utils:write_blocks_remaining(A),
      BWritten = riak_moss_lfs_utils:write_blocks_remaining(B),
      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),
      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),
      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),
      latest_date(ALastDeleted, BLastDeleted).
  
  latest_date(A, B) when A > B -> A;
  
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.
  