diff --git a/packages/app/src/State/Login.ts b/packages/app/src/State/Login.ts
index e6ff5efa..5768098a 100644
--- a/packages/app/src/State/Login.ts
+++ b/packages/app/src/State/Login.ts
@@ -126,7 +126,10 @@ export interface LoginStore {
   latestTags: number;
 
   /**
+<<<<<<< HEAD
 
+=======
+>>>>>>> e05bec8 (feat: follow tags)
    * A list of event ids this user has pinned
    */
   pinned: HexKey[];