diff --git a/apps/frontend/components/templates/Registry/RegistryCard.tsx b/apps/frontend/components/templates/Registry/RegistryCard.tsx
index 22cb45260..0b8745794 100644
--- a/apps/frontend/components/templates/Registry/RegistryCard.tsx
+++ b/apps/frontend/components/templates/Registry/RegistryCard.tsx
@@ -160,64 +160,11 @@ export default function RegistryCard(props: RegistryCardData) {
 
         {/* Attribution */}
         {props.author && (
-<<<<<<< HEAD
           <AuthorSection
             author={_author.title}
             authorImage={authorImage}
             href={authorHref}
           />
-=======
-          <div
-            // onClick={() =>
-            //   handleFilterChange(REGISTRY_FILTER_TYPES.owner, props.author)
-            // }
-            // onLoad={() =>
-            //   prefetchFilterChange(REGISTRY_FILTER_TYPES.owner, props.author)
-            // }
-            className="rounded-sm focus:outline-none focus-visible:ring-[4px] focus-visible:ring-border-light dark:focus-visible:ring-border-dark"
-          >
-            <SanityLink
-              className="inline-flex items-center gap-xxs group"
-              link={{
-                _type: "link",
-                href: `https://github.com/${props.author}`,
-              }}
-            >
-              <span className="body-s-medium font-medium">by</span>
-
-              <>
-                {authorImage?.image.light && (
-                  <SanityImage
-                    maxWidth={20}
-                    image={authorImage.image.light}
-                    alt={authorImage.image.light.alt}
-                    elProps={{
-                      width: 20,
-                      height: 20,
-                      className: "h-5 w-5 dark:hidden",
-                    }}
-                  />
-                )}
-
-                {authorImage?.image.dark && (
-                  <SanityImage
-                    maxWidth={20}
-                    image={authorImage.image.dark}
-                    alt={authorImage.image.dark.alt}
-                    elProps={{
-                      width: 20,
-                      height: 20,
-                      className: "hidden h-5 w-5 dark:inline",
-                    }}
-                  />
-                )}
-              </>
-              <span className="body-s-medium font-mono group-hover:opacity-50 transition-opacity">
-                @{props.author}
-              </span>
-            </SanityLink>
-          </div>
->>>>>>> 782c3d98 (feat: Improved Registy card and Registy page (single) (#1384))
         )}
       </div>
     </li>