fix bad merge; keys were serialized twice