diff --git a/packages/sdk/js/src/gen/types.gen.ts b/packages/sdk/js/src/gen/types.gen.ts
index de47b516f..2bfc671a9 100644
--- a/packages/sdk/js/src/gen/types.gen.ts
+++ b/packages/sdk/js/src/gen/types.gen.ts
@@ -1526,12 +1526,6 @@ export type SessionForkData = {
     messageID?: string
   }
   path: {
-<<<<<<< HEAD
-    /**
-     * Session ID
-     */
-=======
->>>>>>> dev
     id: string
   }
   query?: {