From 546f6309bc08e594319da8e1a9549c5977b8c9cb Mon Sep 17 00:00:00 2001
From: Ahmed Tarek <a7md.tare2@gmail.com>
Date: Sat, 7 May 2022 23:23:42 +0200
Subject: [PATCH] resolve conflicts

---
 src/react/hooks/useQuery.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/react/hooks/useQuery.ts b/src/react/hooks/useQuery.ts
index 5faba104f6a..f5741f15170 100644
--- a/src/react/hooks/useQuery.ts
+++ b/src/react/hooks/useQuery.ts
@@ -434,6 +434,7 @@ class InternalState<TData, TVariables> {
     }), [obsQuery]);
 
     const ssrAllowed = !(
+			this.watchQueryOptions.fetchPolicy === 'standby' ||
       this.queryHookOptions.ssr === false ||
       this.queryHookOptions.skip
     );