diff --git a/fileserver/merge.go b/fileserver/merge.go
index cf1f37e5..f3c7bd6f 100644
--- a/fileserver/merge.go
+++ b/fileserver/merge.go
@@ -161,6 +161,7 @@ func mergeEntries(storeID string, dents []*fsmgr.SeafDirent, baseDir string, opt
 				return nil, err
 			}
 			dents[2].Name = conflictName
+			mergedDents = append(mergedDents, head)
 			mergedDents = append(mergedDents, remote)
 			opt.conflict = true
 		}