fix: merge conflicts

Author: habibayman

app/components/ui/Button.vue

@@ -23,7 +23,6 @@ const buttonVariants = cva(
         destructive:
           'bg-destructive text-background hover:bg-destructive/90 focus-visible:bg-destructive/90 focus-visible:ring-ring-destructive',
         link: 'bg-background underline-offset-4 hover:underline focus-visible:underline text-primary focus-visible:ring-black/0',
-          'hover:text-primary hover:bg-primary/10 focus-visible:bg-primary/10 focus-visible:ring-ring-primary text-primary',
         'tweet-icon-blue':
           'hover:bg-brand-blue/10 focus-visible:bg-brand-blue/10 focus-visible:ring-brand-blue',
         'tweet-icon-red':