fix: conflicts

Author: mattia-sanfilippo

src/components/Layout/Page.tsx

@@ -159,15 +159,9 @@ export function Page({children, toc, routeTree, meta, section}: PageProps) {
                   }
                   {showSurvey && (
                     <>
-<<<<<<< HEAD
-                      <div className="flex flex-col items-center m-4 p-4">
-                        <p className="font-bold text-primary dark:text-primary-dark text-lg mb-4">
-                          Ti sta piacendo questa documentazione?
-=======
                       <div className="flex flex-col items-center p-4 m-4">
                         <p className="mb-4 text-lg font-bold text-primary dark:text-primary-dark">
-                          How do you like these docs?
->>>>>>> 2372ecf920ac4cda7c900f9ac7f9c0cd4284f281
+                          Ti sta piacendo questa documentazione?
                         </p>
                         <div>
                           <ButtonLink

src/components/Layout/TopNav/TopNav.tsx

@@ -267,15 +267,9 @@ export default function TopNav({
                   'flex 3xl:w-[56rem] 3xl:mx-0 relative ps-4 pe-1 py-1 h-10 bg-gray-30/20 dark:bg-gray-40/20 outline-none focus:outline-link betterhover:hover:bg-opacity-80 pointer items-center text-start w-full text-gray-30 rounded-full align-middle text-base'
                 )}
                 onClick={onOpenSearch}>
-<<<<<<< HEAD
-                <IconSearch className="me-3 align-middle text-gray-30 shrink-0 group-betterhover:hover:text-gray-70" />
-                Cerca
-                <span className="ms-auto hidden sm:flex item-center me-1">
-=======
                 <IconSearch className="align-middle me-3 text-gray-30 shrink-0 group-betterhover:hover:text-gray-70" />
-                Search
+                Cerca
                 <span className="hidden ms-auto sm:flex item-center me-1">
->>>>>>> 2372ecf920ac4cda7c900f9ac7f9c0cd4284f281
                   <Kbd data-platform="mac">⌘</Kbd>
                   <Kbd data-platform="win" wide>
                     Ctrl