anchor.diff:                              ItemQueue2 = [BinObj | ItemQueue],
                               ItemQueueLength2 = ItemQueueLength + 1,
                               ItemQueueByteSize2 = ItemQueueByteSize + byte_size(BinObj),
  +<<<<<<< HEAD
   
                               Acc2 = Acc#ho_acc{item_queue_length=ItemQueueLength2,
                                                 item_queue_byte_size=ItemQueueByteSize2},
  
positive.code:                                     total_bytes=TotalBytes} = Acc,
                              M = <<?PT_MSG_OBJ:8,BinObj/binary>>,
                              NumBytes = byte_size(M),
  
                              Stats2 = incr_bytes(incr_objs(Stats), NumBytes),
                              Stats3 = maybe_send_status({Module, SrcPartition,
  
negative.code:                             %% Unit size is bytes:
                              HandoffBatchThreshold = app_helper:get_env(riak_core,
                                                                         handoff_batch_threshold,
  =======
                              
                              Acc2 = Acc#ho_acc{item_queue_length=ItemQueueLength2,
                                                item_queue_byte_size=ItemQueueByteSize2},
                              
                              %% Unit size is bytes:
                              HandoffBatchThreshold = app_helper:get_env(riak_core, 
                                                                         handoff_batch_threshold, 
  >>>>>>> add a simple, point to point capability check for batch message
                                                                         1024*1024),
  
                              case ItemQueueByteSize2 =< HandoffBatchThreshold of
  