solve merge conflict

src/components/NoteStats/LikeButton.tsx

@@ -95,7 +95,6 @@ export default function LikeButton({ event }: { event: Event }) {
     <button
       className="flex items-center enabled:hover:text-primary gap-1 px-3 h-full text-muted-foreground"
       title={t('Like')}
-<<<<<<< HEAD
       disabled={liking || ((isDiscussion || isReplyToDiscussion) && hasVoted)}
       onClick={() => {
         if (isSmallScreen && !((isDiscussion || isReplyToDiscussion) && hasVoted)) {