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: %% @doc Module to resolve siblings with manifest records
  
  -module(riak_moss_manifest_resolution).
  
  %% export Public API
  -export([resolve/1]).
  
negative.code:     %% should this deleted date
      %% be different than the last block
      %% deleted date? I'm think yes, technically.
      LastBlockDeletedTime = resolve_last_deleted_time(A, B),
      A#lfs_manifest_v2{last_block_deleted_time=LastBlockDeletedTime}.
  
  resolve_written_blocks(A, 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 = A#lfs_manifest_v2.delete_blocks_remaining,
      BDeleted = B#lfs_manifest_v2.delete_blocks_remaining,
      ordsets:intersection(ADeleted, BDeleted).
  
  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_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;
  