anchor.diff:  
   gen_new(update) ->
       ?LET(
  -<<<<<<< HEAD
           {Mult, Datatype, WriteOnce, Consistent, NVal, LastWriteWins, DvvEnabled},
           {
               gen_allow_mult(),
               oneof([[], gen_datatype_property()]),
               oneof([[], gen_valid_w1c()]),
  -=======
  -        {Mult, Datatype, Consistent, NVal, LastWriteWins, DvvEnabled},
  -        {
  -            gen_allow_mult(),
  -            oneof([[], gen_datatype_property()]),
  ->>>>>>> 2.0
               oneof([[], gen_maybe_bad_consistent()]),
               oneof([[], [{n_val, choose(1, 10)}]]),
               oneof([[], gen_lww()]),
               oneof([[], gen_dvv_enabled()])
           },
  -<<<<<<< HEAD
           Mult ++ Datatype ++ WriteOnce ++ Consistent ++ NVal ++ LastWriteWins ++ DvvEnabled
  -=======
  -        Mult ++ Datatype ++ Consistent ++ NVal ++ LastWriteWins ++ DvvEnabled
  ->>>>>>> 2.0
       );
   gen_new(create) ->
       Defaults0 = riak_core_bucket_type:defaults(),
  
positive.code:                                true -> lists:keydelete(write_once, 1, lists:keydelete(consistent, 1, Existing0));
                                 false -> Existing0
                             end,
  <<<<<<< HEAD
                  Result={Good, Bad} = validate(update, Bucket, Existing, New),
  
                  %% All we really want to check is that every key in
  
negative.code: validate_create_bucket_type_test() ->
      {Validated, Errors} = validate_create_bucket_type(?LWW_DVV),
      ?assertEqual([{last_write_wins, true}], Validated),
      ?assertMatch([{dvv_enabled, true, _Message}], Errors).
  
  validate_update_bucket_type_test() ->
      {Validated, Errors} = validate_update_bucket_type([], ?LWW_DVV),
      ?assertEqual([{last_write_wins, true}], Validated),
      ?assertMatch([{dvv_enabled, true, _Message}], Errors).
  
  validate_update_typed_bucket_test() ->
      {Validated, Errors} = validate_update_typed_bucket([], ?LWW_DVV),
      ?assertEqual([{last_write_wins, true}], Validated),
      ?assertMatch([{dvv_enabled, true, _Message}], Errors).
  
  validate_default_bucket_test() ->
      {Validated, Errors} = validate_default_bucket([], ?LWW_DVV),
      ?assertEqual([{last_write_wins, true}], Validated),
      ?assertMatch([{dvv_enabled, true, _Message}], Errors).
  
  validate_last_write_wins_implies_not_dvv_enabled_test() ->
      {Validated, Errors} = validate_last_write_wins_implies_not_dvv_enabled({?LWW_DVV, []}),
      ?assertEqual([{last_write_wins, true}], Validated),
      ?assertMatch([{dvv_enabled, true, _Message}], Errors).
  
  test_immutable() ->
     test_immutable(?TEST_TIME_SECS).
  