anchor.diff:                          proplists:get_value(?METADATA_VCLOCK, NewValue, []);
                       false -> []
                   end,
  -            NewVClock = vclock:increment(node(), vclock:merge([OldValueVClock,
  -                                                               NewValueVClock])),
  +            NewVClock = vclock:merge([OldValueVClock, NewValueVClock]),
               [{?METADATA_VCLOCK, NewVClock} | lists:keydelete(?METADATA_VCLOCK,
                                                                1, NewValue)];
           false ->
  
positive.code: strip_metadata(Value) ->
      Value.
  
  %% Set the vclock in NewValue to one that descends from both and that
  %% neither descends from
  merge_vclocks(NewValue, OldValue) ->
      case is_list(NewValue) of
          true ->
  
negative.code:                             Pair -> Pair;
                              Sentinel -> Sentinel;
                              {K, Data} ->
                                  {K, increment_vclock(Data, OldValue)}
                          end
                  end,
      update(fun (Config) -> misc:mapfilter(UpdateFun, Sentinel, Config) end).
  