fixed conflict in KVStore