diff --git a/src/components/Certificate.tsx b/src/components/Certificate.tsx
index 643fd3253..6b87d6801 100644
--- a/src/components/Certificate.tsx
+++ b/src/components/Certificate.tsx
@@ -95,11 +95,7 @@ export const CertificateComponent = ({
         </Button>
         <div className="flex items-center justify-center">
           <Button
-<<<<<<< tailwind-prettier
             className="share-button mr-2 flex items-center bg-transparent"
-=======
-            className="share-button flex items-center mr-2"
->>>>>>> main
             onClick={handleShareLinkedIn}
           >
             <FaLinkedin className="mr-1" /> Share on LinkedIn
diff --git a/src/components/comment/CommentInputForm.tsx b/src/components/comment/CommentInputForm.tsx
index 003135d3d..8ed6a8df8 100644
--- a/src/components/comment/CommentInputForm.tsx
+++ b/src/components/comment/CommentInputForm.tsx
@@ -17,7 +17,7 @@ const CommentInputForm = ({
   const currentPath = usePathname();
   const formRef = React.useRef<HTMLFormElement>(null);
   const textareaRef = React.useRef<HTMLTextAreaElement>(null);
-  const { execute, fieldErrors } = useAction(createMessage, {
+  const { execute, isLoading, fieldErrors } = useAction(createMessage, {
     onSuccess: () => {
       toast('Comment added');
       formRef.current?.reset();
@@ -62,7 +62,13 @@ const CommentInputForm = ({
       />
       <FormErrors id="content" errors={fieldErrors} />
       <div className="flex justify-end gap-2">
-        <Button type="submit">Comment</Button>
+        <Button
+          type="submit"
+          className={`${isLoading && 'opacity-80'}`}
+          disabled={isLoading}
+        >
+          Comment
+        </Button>
       </div>
     </form>
   );