more on this

1 files changed, 4 insertions, 4 deletions

diff --git a/internal/server/repository/repository.go b/internal/server/repository/repository.go
index d2a9a9e..f83175f 100644
--- a/internal/server/repository/repository.go
+++ b/internal/server/repository/repository.go
@@ -95,16 +95,16 @@ func (r Repository) HasEntry(pair EntryPair) bool {
 	return true
 }
 
-func (r Repository) Merge(new types.Entry) {
+func (r Repository) Merge(newEntry types.Entry) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
+	oldEntry, ok := r.entries[newEntry.ID]
 
-	old, ok := r.entries[new.ID]
 	if !ok {
-		r.entries[new.ID] = new
+		r.entries[newEntry.ID] = types.NewEntryFromCopy(newEntry)
 		return
 	}
 
-	r.entries[new.ID] = old.Update(new)
+	r.entries[newEntry.ID] = oldEntry.Updated(newEntry)
 	panic("Not yet implemented: shoud write entry also to disk")
 }