From ce1e57faeafddfb1a95ef210a42026adbcd4c8b1 Mon Sep 17 00:00:00 2001
From: Alex Chi <chi@neon.tech>
Date: Tue, 27 Jun 2023 10:25:06 -0400
Subject: [PATCH] fix merge conflicts

Signed-off-by: Alex Chi <chi@neon.tech>
---
 pageserver/src/tenant/timeline.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs
index 24e3058f8f..b7929e0617 100644
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -4032,6 +4032,7 @@ impl Timeline {
                 LayerResidenceEventReason::LayerCreate,
             );
             updates.insert_historic(x.layer_desc().clone());
+            mapping.insert(x);
         }
 
         // Now that we have reshuffled the data to set of new delta layers, we can