merge fix

src/components/CookiesBanner/index.tsx

@@ -298,75 +298,6 @@ const CookiesBanner = isDesktop
           {!localSupportAndUpdates && !isSafeAppView && (
             <FakeIntercomButton onClick={() => openBanner(COOKIE_IDS.INTERCOM)} />
           )}
-<<<<<<< HEAD
-          <p className={classes.text}>
-            We use cookies to provide you with the best experience and to help improve our website and application.
-            Please read our{' '}
-            <Link className={classes.link} to="https://gnosis-safe.io/cookie">
-              Cookie Policy
-            </Link>{' '}
-            for more information. By clicking &quot;Accept all&quot;, you agree to the storing of cookies on your device
-            to enhance site navigation, analyze site usage and provide customer support.
-          </p>
-          <div className={classes.form}>
-            <div className={classes.formItem}>
-              <FormControlLabel
-                checked={localNecessary}
-                control={<Checkbox disabled />}
-                disabled
-                label="Necessary"
-                name="Necessary"
-                onChange={() => setLocalNecessary((prev) => !prev)}
-                value={localNecessary}
-              />
-            </div>
-            {/* <div className={classes.formItem}>
-              <FormControlLabel
-                control={<Checkbox checked={localIntercom} />}
-                label="Customer support"
-                name="Customer support"
-                onChange={() => setLocalIntercom((prev) => !prev)}
-                value={localIntercom}
-              />
-            </div> */}
-            <div className={classes.formItem}>
-              <FormControlLabel
-                control={<Checkbox checked={localAnalytics} />}
-                label="Analytics"
-                name="Analytics"
-                onChange={() => setLocalAnalytics((prev) => !prev)}
-                value={localAnalytics}
-              />
-            </div>
-            <div className={classes.formItem}>
-              <Button
-                color="primary"
-                component={Link}
-                minWidth={180}
-                onClick={() => closeCookiesBannerHandler()}
-                variant="outlined"
-              >
-                Accept selection
-              </Button>
-            </div>
-            <div className={classes.formItem}>
-              <Button
-                color="primary"
-                component={Link}
-                minWidth={180}
-                onClick={() => acceptCookiesHandler()}
-                variant="contained"
-              >
-                Accept all
-              </Button>
-            </div>
-          </div>
-        </div>
-      </div>
-    )
-  }
-=======
->>>>>>> gnosis_v3.22.0
 
           {/* The cookie banner itself */}
           {cookieBannerOpen && (