From 676b50d5f466a338ad39b6fead4024b887e22fe2 Mon Sep 17 00:00:00 2001
From: Ping Xie <pingxie@google.com>
Date: Thu, 27 Jun 2024 16:55:56 -0700
Subject: [PATCH] fix bad merge

Signed-off-by: Ping Xie <pingxie@google.com>
---
 src/dict.c     | 8 +-------
 src/listpack.c | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/dict.c b/src/dict.c
index 07d58bc021..70e315130d 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -895,14 +895,8 @@ void dictSetKey(dict *d, dictEntry *de, void *key) {
 }
 
 void dictSetVal(dict *d, dictEntry *de, void *val) {
-<<<<<<< HEAD
-    void *v = d->type->valDup ? d->type->valDup(d, val) : val;
-    DICT_SET_VALUE(de, v.val, v);
-=======
     UNUSED(d);
-    assert(entryHasValue(de));
-    de->v.val = val;
->>>>>>> 8cd5fd5bae60aab334dec2147a85f390a3ba01f4
+    DICT_SET_VALUE(de, v.val, val);
 }
 
 void dictSetSignedIntegerVal(dictEntry *de, int64_t val) {
diff --git a/src/listpack.c b/src/listpack.c
index 692f4df529..f7404a746e 100644
--- a/src/listpack.c
+++ b/src/listpack.c
@@ -866,7 +866,7 @@ unsigned char *lpInsert(unsigned char *lp,
         *newp = dst;
         /* In case of deletion, set 'newp' to NULL if the next element is
          * the EOF element. */
-        if (delete &&dst[0] == LP_EOF) *newp = NULL;
+        if (del_ele &&dst[0] == LP_EOF) *newp = NULL;
     }
     if (!del_ele) {
         if (enctype == LP_ENCODING_INT) {