finished merging

src/App.svelte

@@ -2,7 +2,7 @@
   import Layout from './lib/layout/Layout.svelte';
   import WorldMap from './lib/world-map/WorldMap.svelte';
   import StatsPanel from './lib/world-map/StatsPanel.svelte';
-  import Timeline from './lib/Timeline.svelte';
+  import TimelineView from './lib/TimelineView.svelte';
 
   let screen = $state('worldmap');
 
@@ -20,7 +20,7 @@
       <StatsPanel />
     </div>
   {:else}
-    <Timeline />
+    <TimelineView />
   {/if}
 </Layout>
 

src/lib/Timeline.svelte

@@ -1,15 +0,0 @@
-<div class="placeholder">
-  <p>Timeline — coming soon</p>
-</div>
-
-<style>
-  .placeholder {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font: 16px/1.4 sans-serif;
-    color: #888;
-  }
-</style>