diff --git a/src/storages/hydrate.ts b/src/storages/hydrate.ts
index 522eb20c..15af9e18 100644
--- a/src/storages/hydrate.ts
+++ b/src/storages/hydrate.ts
@@ -226,7 +226,6 @@ function gatherQuotes({ events, store, signal }: HydrateOpts): Promise<DittoEven
 }
 
 /** Collect authors from the events. */
-<<<<<<< HEAD
 function gatherAuthors({ events, store, signal }: HydrateOpts): Promise<DittoEvent[]> {
   const pubkeys = new Set<string>();