From 91d48d6cb4d3bd5cf329bb15ffc05a2c6d8be7a3 Mon Sep 17 00:00:00 2001
From: KanishkaRajputd <kanishka6393rajput@gmail.com>
Date: Fri, 26 Apr 2024 17:38:29 +0530
Subject: [PATCH] all track active proposal count fix

---
 src/components/OnchainIdentity/IdentityForm.tsx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/components/OnchainIdentity/IdentityForm.tsx b/src/components/OnchainIdentity/IdentityForm.tsx
index b4f198607d..866eb0e90a 100644
--- a/src/components/OnchainIdentity/IdentityForm.tsx
+++ b/src/components/OnchainIdentity/IdentityForm.tsx
@@ -338,11 +338,7 @@ const IdentityForm = ({
 				form={form}
 				initialValues={{ displayName, email: email?.value, legalName, twitter: twitter?.value }}
 			>
-<<<<<<< HEAD
-				{alreadyVerifiedfields?.twitter && alreadyVerifiedfields?.email && alreadyVerifiedfields?.displayName && !alreadyVerifiedfields.alreadyVerified && (
-=======
 				{!!alreadyVerifiedfields?.twitter && !!alreadyVerifiedfields?.email && !!alreadyVerifiedfields?.displayName && !alreadyVerifiedfields.alreadyVerified && (
->>>>>>> 8433fcb059d6dada0b77454c1950392452ddb97a
 					<Alert
 						className='mb-6'
 						type='warning'
@@ -725,15 +721,9 @@ const IdentityForm = ({
 					variant='default'
 					buttonsize='xs'
 				/>
-<<<<<<< HEAD
-				{alreadyVerifiedfields?.twitter &&
-				alreadyVerifiedfields?.email &&
-				alreadyVerifiedfields?.displayName &&
-=======
 				{!!alreadyVerifiedfields?.twitter &&
 				!!alreadyVerifiedfields?.email &&
 				!!alreadyVerifiedfields?.displayName &&
->>>>>>> 8433fcb059d6dada0b77454c1950392452ddb97a
 				handleAllowSetIdentity() &&
 				!alreadyVerifiedfields.alreadyVerified ? (
 					<CustomButton