diff --git a/.talismanrc b/.talismanrc
index 384bfc36..0962f0a9 100644
--- a/.talismanrc
+++ b/.talismanrc
@@ -1,11 +1,13 @@
 fileignoreconfig:
-- filename: .github/workflows/secrets-scan.yml
-  ignore_detectors:
-    - filecontent
-- filename: README.md
-  checksum: 568289bbe7c088967493db246dbf29e465382648ac574c1b1236be57d5662a38
-- filename: CHANGELOG.md
-  checksum: 677807c38f5135fac7ca0377e92953fb09097150ddd3c4f68667fe0368f916ee
-- filename: src/visualBuilder/components/__test__/fieldToolbar.test.tsx
-  checksum: 3badd6a142456b6a361569e6fc546349a38ac6b366bef7fd5255d1e93220444e
-version: "1.0"
\ No newline at end of file
+    - filename: .github/workflows/secrets-scan.yml
+      ignore_detectors:
+          - filecontent
+    - filename: README.md
+      checksum: 568289bbe7c088967493db246dbf29e465382648ac574c1b1236be57d5662a38
+    - filename: CHANGELOG.md
+      checksum: 677807c38f5135fac7ca0377e92953fb09097150ddd3c4f68667fe0368f916ee
+    - filename: src/visualBuilder/components/__test__/fieldToolbar.test.tsx
+      checksum: 3badd6a142456b6a361569e6fc546349a38ac6b366bef7fd5255d1e93220444e
+    - filename: src/visualBuilder/components/Collab/ThreadPopup/__test__/CommentTextArea.test.tsx
+      checksum: d0ef271ee5381d9feab06bda6e7e89bd0a882fee87495627bd811c1f0a5459c7
+version: "1.0"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5494c12b..5b2b5a45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,37 @@
 # Changelog
 
+## [v3.2.4](https://github.com/contentstack/live-preview-sdk/compare/v3.2.3...v3.2.4)
+
+> 10 June 2025
+
+### General Changes
+
+- Revert 441 revert 439 collab (diwakarmk7 - [#443](https://github.com/contentstack/live-preview-sdk/pull/443))
+
+### General Changes
+
+- Revert "Revert "Collab"" (diwakarmk7 - [087ab2a](https://github.com/contentstack/live-preview-sdk/commit/087ab2aa818897ce409c61c2472f4b03cbf9762b))
+- review comment resolved (diwakarmk7 - [87f990f](https://github.com/contentstack/live-preview-sdk/commit/87f990f9b8e8770ab074dbc5a0624e021e5529fd))
+
 ## [v3.2.3](https://github.com/contentstack/live-preview-sdk/compare/v3.2.2...v3.2.3)
 
-> 28 May 2025
+> 29 May 2025
 
 ### Fixes
 
 - fix: update LightLivePreviewHoC config to use IExportedConfig type (Kirtesh Suthar - [#438](https://github.com/contentstack/live-preview-sdk/pull/438))
 
+### General Changes
+
+- Release version 3.2.3 (Kirtesh Suthar - [#442](https://github.com/contentstack/live-preview-sdk/pull/442))
+- Revert "Collab" (diwakarmk7 - [#441](https://github.com/contentstack/live-preview-sdk/pull/441))
+- Collab (diwakarmk7 - [#439](https://github.com/contentstack/live-preview-sdk/pull/439))
+- Prepare for release from - Develop v3 (Kirtesh Suthar - [#440](https://github.com/contentstack/live-preview-sdk/pull/440))
+
 ### Fixes
 
+- fix: update Contentstack Live Preview utils import to version 3.2.3 in README.md (Kirtesh Suthar - [e7da871](https://github.com/contentstack/live-preview-sdk/commit/e7da8715787d6636cff4ad4c09233e57a727af72))
+- fix(collab): username display difference fix (diwakarmk7 - [bfc29e3](https://github.com/contentstack/live-preview-sdk/commit/bfc29e36527e62fa682089769bb3653dbc924dbc))
 - fix: update checksum for README.md in .talismanrc (Kirtesh Suthar - [45c8c99](https://github.com/contentstack/live-preview-sdk/commit/45c8c9976ae04970a0fcf11dd2fce35f4dee949b))
 - fix: update script integrity hash in README.md for Contentstack Live Preview utils (Kirtesh Suthar - [1f024ce](https://github.com/contentstack/live-preview-sdk/commit/1f024ce31c299cd312cfb26ba85498d967f02d25))
 
@@ -17,6 +39,13 @@
 
 - refactor: move LightLivePreviewHoC to a new file and simplify index.ts (Kirtesh Suthar - [e248309](https://github.com/contentstack/live-preview-sdk/commit/e248309141411ac1398b7661bdc5bd83dfab8857))
 
+### General Changes
+
+- conflict resolve (diwakarmk7 - [45d4c6f](https://github.com/contentstack/live-preview-sdk/commit/45d4c6f77a05a4a254f9b96624b87a2453f03679))
+- added tests for comment text area comp (diwakarmk7 - [2ca321b](https://github.com/contentstack/live-preview-sdk/commit/2ca321b853e524f8d635f6270ca7f26e5bf8807a))
+- added tests for comment text area comp (diwakarmk7 - [119fc48](https://github.com/contentstack/live-preview-sdk/commit/119fc48cedaaa67518096595984d6c4b120edaa0))
+- popup state fix (diwakarmk7 - [0f8dcf1](https://github.com/contentstack/live-preview-sdk/commit/0f8dcf1df32a52ffff9e1a168200c28f085bee2f))
+
 ## [v3.2.2](https://github.com/contentstack/live-preview-sdk/compare/v3.2.1...v3.2.2)
 
 > 16 May 2025
@@ -347,7 +376,7 @@
 - jira.yml (Aravind Kumar - [30e4861](https://github.com/contentstack/live-preview-sdk/commit/30e4861e33d5f7c89cffef109e50aa811f6b346a))
 - sca-scan.yml (Aravind Kumar - [bcb5ca8](https://github.com/contentstack/live-preview-sdk/commit/bcb5ca8a3a820fab6199166882ae80e8438a074d))
 
-## [v3.1.0](https://github.com/contentstack/live-preview-sdk/compare/v3.0.3...v3.1.0)
+## [v3.1.0](https://github.com/contentstack/live-preview-sdk/compare/v3.0.2...v3.1.0)
 
 > 16 January 2025
 
@@ -395,9 +424,9 @@
 - test: update mock type casting in visual builder tests (hiteshshetty-dev - [a2d4397](https://github.com/contentstack/live-preview-sdk/commit/a2d4397f53f114e5c7d19e3c0ea2329581e1009f))
 - test: enable number field test suite in visual builder input tests (hiteshshetty-dev - [0f59956](https://github.com/contentstack/live-preview-sdk/commit/0f5995635cb1cf29ccdac1ec45b1288b6d494e2d))
 
-## [v3.0.3](https://github.com/contentstack/live-preview-sdk/compare/v3.0.2...v3.0.3)
+## [v3.0.2](https://github.com/contentstack/live-preview-sdk/compare/v3.0.1...v3.0.2)
 
-> 7 January 2025
+> 3 January 2025
 
 ### Fixes
 
@@ -443,14 +472,6 @@
 - Merge pull request #308 from contentstack/VE-4326 (Sairaj - [1b5cde7](https://github.com/contentstack/live-preview-sdk/commit/1b5cde7de17ebf6d9c26facb3f155ce7d4baae0f))
 - Merge pull request #301 from contentstack/VE-4009-pseudo-multiple (Sairaj - [e8c6080](https://github.com/contentstack/live-preview-sdk/commit/e8c608078df7256d1634175f81c9928612b0d9b8))
 
-## [v3.0.2](https://github.com/contentstack/live-preview-sdk/compare/v3.0.1...v3.0.2)
-
-> 7 January 2025
-
-### New Features
-
-- feat: added changelog flow (Kirtesh Suthar - [ff5c822](https://github.com/contentstack/live-preview-sdk/commit/ff5c82244b126dbc4c4545be6025950bb2cf9421))
-
 ## [v3.0.1](https://github.com/contentstack/live-preview-sdk/compare/v3.0.0...v3.0.1)
 
 > 15 November 2024
@@ -1081,7 +1102,6 @@
 
 ### Fixes
 
-- fix: add version bump in package json (Kirtesh Suthar - [#142](https://github.com/contentstack/live-preview-sdk/pull/142))
 - fix: edit button was removed from document (Mridul Sharma - [#135](https://github.com/contentstack/live-preview-sdk/pull/135))
 - fix: removed headers key from SDK init data (Mridul Sharma - [#132](https://github.com/contentstack/live-preview-sdk/pull/132))
 
@@ -1106,6 +1126,10 @@
 
 > 18 June 2024
 
+### Fixes
+
+- fix: add version bump in package json (Kirtesh Suthar - [#142](https://github.com/contentstack/live-preview-sdk/pull/142))
+
 ### General Changes
 
 - Update README.md (Kirtesh Suthar - [#141](https://github.com/contentstack/live-preview-sdk/pull/141))
diff --git a/README.md b/README.md
index b08a6487..79f3a344 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Alternatively, if you want to include the package directly in your website HTML
 
 ```html
 <script type='module'  integrity='sha384-b6G+ggU20rGxqCqsgaS6zludFgj5N11xsuXhMEIARMuQY2PtyDS04TU0H5goP+32' crossorigin="anonymous">
-     import ContentstackLivePreview from 'https://esm.sh/@contentstack/live-preview-utils@3.2.3';
+     import ContentstackLivePreview from 'https://esm.sh/@contentstack/live-preview-utils@3.2.4';
 
      ContentstackLivePreview.init({
         stackDetails: {
diff --git a/package-lock.json b/package-lock.json
index 6e402fc0..9c3f3650 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@contentstack/live-preview-utils",
-    "version": "3.2.3",
+    "version": "3.2.4",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@contentstack/live-preview-utils",
-            "version": "3.2.3",
+            "version": "3.2.4",
             "license": "MIT",
             "dependencies": {
                 "@preact/compat": "17.1.2",
diff --git a/package.json b/package.json
index 3dc770a2..ef28d398 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@contentstack/live-preview-utils",
-    "version": "3.2.3",
+    "version": "3.2.4",
     "description": "Contentstack provides the Live Preview SDK to establish a communication channel between the various Contentstack SDKs and your website, transmitting  live changes to the preview pane.",
     "type": "module",
     "types": "dist/legacy/index.d.ts",
diff --git a/src/visualBuilder/components/Collab/ThreadPopup/CommentTextArea.tsx b/src/visualBuilder/components/Collab/ThreadPopup/CommentTextArea.tsx
index 203842dc..94515f54 100644
--- a/src/visualBuilder/components/Collab/ThreadPopup/CommentTextArea.tsx
+++ b/src/visualBuilder/components/Collab/ThreadPopup/CommentTextArea.tsx
@@ -102,12 +102,22 @@ const MentionSuggestionsList: React.FC<{
                     tabIndex={-1}
                     aria-selected={index === selectedIndex}
                 >
-                    {(user.display?.length || 0) > 20 ? (
-                        <Tooltip content={user.display || ""}>
-                            {(user.display || "").substring(0, 18) + "..."}
-                        </Tooltip>
+                    {user.display === user.email ? (
+                        user.display.length > 20 ? (
+                            <Tooltip content={user.display || ""}>
+                                {(user.display || "").substring(0, 18) + "..."}
+                            </Tooltip>
+                        ) : (
+                            user.display
+                        )
                     ) : (
-                        user.display || ""
+                        <Tooltip
+                            content={user.display + " - " + user.email || ""}
+                        >
+                            {user.display.length > 20
+                                ? (user.display || "").substring(0, 18) + "..."
+                                : user.display}
+                        </Tooltip>
                     )}
                 </li>
             ))}
diff --git a/src/visualBuilder/components/Collab/ThreadPopup/__test__/CommentTextArea.test.tsx b/src/visualBuilder/components/Collab/ThreadPopup/__test__/CommentTextArea.test.tsx
new file mode 100644
index 00000000..74cead4c
--- /dev/null
+++ b/src/visualBuilder/components/Collab/ThreadPopup/__test__/CommentTextArea.test.tsx
@@ -0,0 +1,367 @@
+/** @jsxImportSource preact */
+import { render, screen, fireEvent } from "@testing-library/preact";
+import CommentTextArea from "../CommentTextArea";
+import { useCommentTextArea } from "../../../../hooks/useCommentTextArea";
+import { Mock } from "vitest";
+import React from "preact/compat";
+import classNames from "classnames";
+
+// Mock dependencies
+vi.mock("../../../../hooks/useCommentTextArea");
+vi.mock("../Tooltip/Tooltip", () => ({
+    default: ({ children, content }) => (
+        <div data-tooltip={content}>{children}</div>
+    ),
+}));
+vi.mock("../../../../collab.style", () => ({
+    collabStyles: () => ({
+        "collab-thread-input-indicator--error": "mocked-error-class",
+        "collab-thread-input-indicator--count": "mocked-count-class",
+        "collab-thread-body--input--wrapper": "mocked-wrapper-class",
+        "collab-thread-body--input": "mocked-input-class",
+        "collab-thread-body--input--textarea--wrapper":
+            "mocked-textarea-wrapper-class",
+        "collab-thread-body--input--textarea": "mocked-textarea-class",
+        "collab-thread-body--input--textarea--suggestionsList":
+            "mocked-suggestions-list-class",
+        "collab-thread-body--input--textarea--suggestionsList--item":
+            "mocked-suggestion-item-class",
+        "collab-thread-body--input--textarea--suggestionsList--item-selected":
+            "mocked-selected-item-class",
+        "collab-thread-input-indicator--wrapper":
+            "mocked-indicator-wrapper-class",
+    }),
+    flexAlignCenter: "flex-align-center-class",
+}));
+
+const mockUserState = {
+    userMap: {
+        user1: {
+            uid: "user1",
+            email: "john.doe@example.com",
+        },
+    },
+    currentUser: {
+        uid: "user1",
+        email: "john.doe@example.com",
+    },
+    mentionsList: [
+        {
+            uid: "user1",
+            email: "john.doe@example.com",
+            display: "John Doe",
+        },
+        {
+            uid: "user2",
+            email: "jane.smith@example.com",
+            display: "Jane Smith",
+        },
+    ],
+};
+
+const mockComment = {
+    _id: "comment1",
+    threadUid: "thread-1",
+    message: "This is a comment",
+    author: "john.doe@example.com",
+    toUsers: [],
+    images: [],
+    createdAt: "2022-01-01T12:00:00Z",
+    createdBy: "user1",
+};
+
+const mockHandleOnSaveRef = { current: vi.fn() };
+const mockOnClose = vi.fn();
+
+// Mock implementation of useCommentTextArea hook
+const setupMockHook = (overrides = {}) => {
+    const defaultMock = {
+        state: { message: "Test message" },
+        error: { message: "" },
+        showSuggestions: false,
+        cursorPosition: { top: 20, showAbove: false },
+        selectedIndex: 0,
+        filteredUsers: [],
+        inputRef: { current: null },
+        listRef: { current: null },
+        itemRefs: { current: [] },
+        handleInputChange: vi.fn(),
+        handleKeyDown: vi.fn(),
+        handleSubmit: vi.fn(),
+        insertMention: vi.fn(),
+        maxMessageLength: 1000,
+    };
+
+    const mockImplementation = { ...defaultMock, ...overrides };
+    (useCommentTextArea as Mock).mockReturnValue(mockImplementation);
+    return mockImplementation;
+};
+
+describe("CommentTextArea", () => {
+    beforeEach(() => {
+        setupMockHook();
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it("should render the textarea with correct placeholder", () => {
+        render(
+            <CommentTextArea
+                userState={mockUserState}
+                handleOnSaveRef={mockHandleOnSaveRef}
+                comment={mockComment}
+                onClose={mockOnClose}
+            />
+        );
+
+        // Use a more reliable query that doesn't depend on exact placeholder text
+        const textarea = screen.getByRole("textbox");
+        expect(textarea).toBeInTheDocument();
+
+        // Check if placeholder contains the expected text without worrying about exact quotes
+        const placeholder = textarea.getAttribute("placeholder");
+        expect(placeholder).toContain("Enter a comment or tag others using");
+        expect(placeholder).toContain("@");
+    });
+
+    it("should set handleOnSaveRef.current to handleSubmit from the hook", () => {
+        const mockHook = setupMockHook();
+        render(
+            <CommentTextArea
+                userState={mockUserState}
+                handleOnSaveRef={mockHandleOnSaveRef}
+                comment={mockComment}
+                onClose={mockOnClose}
+            />
+        );
+
+        expect(mockHandleOnSaveRef.current).toBe(mockHook.handleSubmit);
+    });
+
+    it("should call handleInputChange when typing in textarea", () => {
+        const mockHook = setupMockHook();
+        render(
+            <CommentTextArea
+                userState={mockUserState}
+                handleOnSaveRef={mockHandleOnSaveRef}
+                comment={mockComment}
+                onClose={mockOnClose}
+            />
+        );
+
+        const textarea = screen.getByRole("textbox");
+        fireEvent.change(textarea, { target: { value: "New text" } });
+
+        expect(mockHook.handleInputChange).toHaveBeenCalled();
+    });
+
+    it("should call handleKeyDown when pressing keys in textarea", () => {
+        const mockHook = setupMockHook();
+        render(
+            <CommentTextArea
+                userState={mockUserState}
+                handleOnSaveRef={mockHandleOnSaveRef}
+                comment={mockComment}
+                onClose={mockOnClose}
+            />
+        );
+
+        const textarea = screen.getByRole("textbox");
+        fireEvent.keyDown(textarea, { key: "Enter" });
+
+        expect(mockHook.handleKeyDown).toHaveBeenCalled();
+    });
+
+    it("should display error message when there is an error", () => {
+        setupMockHook({ error: { message: "Error message" } });
+        render(
+            <CommentTextArea
+                userState={mockUserState}
+                handleOnSaveRef={mockHandleOnSaveRef}
+                comment={mockComment}
+                onClose={mockOnClose}
+            />
+        );
+
+        expect(screen.getByText("Error message")).toBeInTheDocument();
+    });
+
+    it("should display character counter with correct values", () => {
+        setupMockHook({ state: { message: "Hello" }, maxMessageLength: 100 });
+        render(
+            <CommentTextArea
+                userState={mockUserState}
+                handleOnSaveRef={mockHandleOnSaveRef}
+                comment={mockComment}
+                onClose={mockOnClose}
+            />
+        );
+
+        expect(screen.getByText("5/100")).toBeInTheDocument();
+    });
+
+    it("should render MentionSuggestionsList when showSuggestions is true", () => {
+        setupMockHook({
+            showSuggestions: true,
+            filteredUsers: [
+                {
+                    uid: "user1",
+                    email: "john@example.com",
+                    display: "John Doe",
+                },
+                {
+                    uid: "user2",
+                    email: "jane@example.com",
+                    display: "Jane Smith",
+                },
+            ],
+            selectedIndex: 0,
+        });
+
+        render(
+            <CommentTextArea
+                userState={mockUserState}
+                handleOnSaveRef={mockHandleOnSaveRef}
+                comment={mockComment}
+                onClose={mockOnClose}
+            />
+        );
+
+        expect(screen.getByText("John Doe")).toBeInTheDocument();
+        expect(screen.getByText("Jane Smith")).toBeInTheDocument();
+    });
+
+    it("should not render MentionSuggestionsList when showSuggestions is false", () => {
+        setupMockHook({
+            showSuggestions: false,
+            filteredUsers: [
+                {
+                    uid: "user1",
+                    email: "john@example.com",
+                    display: "John Doe",
+                },
+                {
+                    uid: "user2",
+                    email: "jane@example.com",
+                    display: "Jane Smith",
+                },
+            ],
+        });
+
+        render(
+            <CommentTextArea
+                userState={mockUserState}
+                handleOnSaveRef={mockHandleOnSaveRef}
+                comment={mockComment}
+                onClose={mockOnClose}
+            />
+        );
+
+        expect(screen.queryByText("John Doe")).not.toBeInTheDocument();
+        expect(screen.queryByText("Jane Smith")).not.toBeInTheDocument();
+    });
+});
+
+// Test sub-components individually
+describe("ErrorIndicator", () => {
+    it("should render error message", () => {
+        // We can access the ErrorIndicator through the CommentTextArea component
+        setupMockHook({ error: { message: "Test error message" } });
+        render(
+            <CommentTextArea
+                userState={mockUserState}
+                handleOnSaveRef={mockHandleOnSaveRef}
+                comment={mockComment}
+                onClose={mockOnClose}
+            />
+        );
+
+        expect(screen.getByText("Test error message")).toBeInTheDocument();
+    });
+});
+
+describe("CharacterCounter", () => {
+    it("should display current and max length", () => {
+        setupMockHook({ state: { message: "Test" }, maxMessageLength: 50 });
+        render(
+            <CommentTextArea
+                userState={mockUserState}
+                handleOnSaveRef={mockHandleOnSaveRef}
+                comment={mockComment}
+                onClose={mockOnClose}
+            />
+        );
+
+        expect(screen.getByText("4/50")).toBeInTheDocument();
+    });
+});
+
+describe("MentionSuggestionsList", () => {
+    it("should display filtered users and highlight the selected one", () => {
+        setupMockHook({
+            showSuggestions: true,
+            filteredUsers: [
+                {
+                    uid: "user1",
+                    email: "john@example.com",
+                    display: "John Doe",
+                },
+                {
+                    uid: "user2",
+                    email: "jane@example.com",
+                    display: "Jane Smith",
+                },
+            ],
+            selectedIndex: 1,
+        });
+
+        render(
+            <CommentTextArea
+                userState={mockUserState}
+                handleOnSaveRef={mockHandleOnSaveRef}
+                comment={mockComment}
+                onClose={mockOnClose}
+            />
+        );
+
+        const selectedItem = screen.getByText("Jane Smith").closest("li");
+        expect(selectedItem).toHaveAttribute("aria-selected", "true");
+    });
+
+    it("should truncate long display names", () => {
+        setupMockHook({
+            showSuggestions: true,
+            filteredUsers: [
+                {
+                    uid: "user3",
+                    email: "very.long.email@example.com",
+                    display: "Very Long Name That Should Be Truncated",
+                },
+            ],
+            selectedIndex: 0,
+        });
+
+        render(
+            <CommentTextArea
+                userState={mockUserState}
+                handleOnSaveRef={mockHandleOnSaveRef}
+                comment={mockComment}
+                onClose={mockOnClose}
+            />
+        );
+
+        // Use a more flexible approach to find truncated text
+        const truncatedTextElement = screen.getByText((content, element) => {
+            return (
+                content.includes("Very Long Name") &&
+                content.includes("...") &&
+                element.tagName.toLowerCase() !== "html" &&
+                element.tagName.toLowerCase() !== "body"
+            );
+        });
+
+        expect(truncatedTextElement).toBeInTheDocument();
+    });
+});
diff --git a/src/visualBuilder/eventManager/useCollab.ts b/src/visualBuilder/eventManager/useCollab.ts
index 825ecb69..7f05cc2b 100644
--- a/src/visualBuilder/eventManager/useCollab.ts
+++ b/src/visualBuilder/eventManager/useCollab.ts
@@ -43,6 +43,10 @@ export const useCollab = () => {
                     "collab.pauseFeedback",
                     data?.data?.collab?.pauseFeedback
                 );
+                Config.set(
+                    "collab.isFeedbackMode",
+                    data?.data?.collab?.isFeedbackMode
+                );
                 showAllCollabIcons();
                 return;
             }
diff --git a/src/visualBuilder/generators/generateThread.tsx b/src/visualBuilder/generators/generateThread.tsx
index 850cac7e..8f54a506 100644
--- a/src/visualBuilder/generators/generateThread.tsx
+++ b/src/visualBuilder/generators/generateThread.tsx
@@ -376,6 +376,7 @@ export function hideAllCollabIcons(): void {
         ".visual-builder__collab-wrapper .collab-thread"
     );
     icons?.forEach((icon) => icon?.classList.add(hiddenClass));
+    toggleCollabPopup({ threadUid: "", action: "close" });
 }
 
 export function showAllCollabIcons(): void {