diff --git a/package.json b/package.json
index ff27588c640..01e1ff56c5b 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,9 @@
 {
     "name": "matrix-react-sdk",
-<<<<<<< HEAD
     "version": "0.0.0",
-    "version-matrix": "3.98.0",
+    "version-matrix": "3.100.0-rc.0",
     "description": "SDK for matrix.org using React for Tchap",
     "author": "DINUM",
-=======
-    "version": "3.100.0-rc.0",
-    "description": "SDK for matrix.org using React",
-    "author": "matrix.org",
->>>>>>> v3.100.0-rc.0
     "repository": {
         "type": "git",
         "url": "https://github.com/tchapgouv/matrix-react-sdk-tchap"
diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index f0213d5aa01..d94162393e6 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -88,9 +88,6 @@ type Props<T extends keyof JSX.IntrinsicElements> = DynamicHtmlElementProps<T> &
     /**
      * Event handler for button activation. Should be implemented exactly like a normal `onClick` handler.
      */
-<<<<<<< HEAD
-    onClick?: ((e: ButtonEvent) => void | Promise<void>) | null;
-=======
     onClick: ((e: ButtonEvent) => void | Promise<void>) | null;
     /**
      * The tooltip to show on hover or focus.
@@ -109,7 +106,6 @@ type Props<T extends keyof JSX.IntrinsicElements> = DynamicHtmlElementProps<T> &
      * Callback for when the tooltip is opened or closed.
      */
     onTooltipOpenChange?: TooltipProps["onOpenChange"];
->>>>>>> v3.100.0-rc.0
 };
 
 /**
diff --git a/src/components/views/messages/DecryptionFailureBody.tsx b/src/components/views/messages/DecryptionFailureBody.tsx
index ee26e86f259..1e94e533cd1 100644
--- a/src/components/views/messages/DecryptionFailureBody.tsx
+++ b/src/components/views/messages/DecryptionFailureBody.tsx
@@ -20,27 +20,8 @@ import { DecryptionFailureCode } from "matrix-js-sdk/src/crypto-api";
 
 import { _t } from "../../../languageHandler";
 import { IBodyProps } from "./IBodyProps";
-<<<<<<< HEAD
 import TchapUrls from "../../../../../../src/tchap/util/TchapUrls"; // :TCHAP: better-text-for-locked-messages
 import ExternalLink from "../elements/ExternalLink"; // :TCHAP: better-text-for-locked-messages
-
-function getErrorMessage(mxEvent?: MatrixEvent): string {
-    return mxEvent?.isEncryptedDisabledForUnverifiedDevices
-        ? _t("timeline|decryption_failure_blocked")
-        // :TCHAP: better-text-for-locked-messages - : _t("threads|unable_to_decrypt");
-        : _t(
-            "threads|unable_to_decrypt_with_info_message",
-            {},
-            {
-                a: (sub) => (
-                    <ExternalLink href={TchapUrls.lockedMessagesPage}>
-                        {sub}
-                    </ExternalLink>
-                ),
-            },
-        );
-    // end :TCHAP:
-=======
 import { LocalDeviceVerificationStateContext } from "../../../contexts/LocalDeviceVerificationStateContext";
 
 function getErrorMessage(mxEvent: MatrixEvent, isVerified: boolean | undefined): string {
@@ -61,8 +42,19 @@ function getErrorMessage(mxEvent: MatrixEvent, isVerified: boolean | undefined):
         case DecryptionFailureCode.HISTORICAL_MESSAGE_USER_NOT_JOINED:
             return _t("timeline|decryption_failure|historical_event_user_not_joined");
     }
-    return _t("timeline|decryption_failure|unable_to_decrypt");
->>>>>>> v3.100.0-rc.0
+     // :TCHAP: better-text-for-locked-messages : return _t("timeline|decryption_failure|unable_to_decrypt");
+    return _t(
+            "threads|unable_to_decrypt_with_info_message",
+            {},
+            {
+                a: (sub) => (
+                    <ExternalLink href={TchapUrls.lockedMessagesPage}>
+                        {sub}
+                    </ExternalLink>
+                ),
+            },
+        );
+    // end :TCHAP:
 }
 
 // A placeholder element for messages that could not be decrypted
diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx
index b8a63b07751..54a6d8ecec8 100644
--- a/src/components/views/right_panel/RoomSummaryCard.tsx
+++ b/src/components/views/right_panel/RoomSummaryCard.tsx
@@ -483,12 +483,9 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, permalinkCreator, onClose, on
                     </Badge>
                 )}
             </Flex>
-<<<<<<< HEAD
             */}
-=======
 
             <RoomTopic room={room} />
->>>>>>> v3.100.0-rc.0
         </header>
     );
 
diff --git a/src/components/views/rooms/ThreadSummary.tsx b/src/components/views/rooms/ThreadSummary.tsx
index 47b8643dbc7..2e03262bd7a 100644
--- a/src/components/views/rooms/ThreadSummary.tsx
+++ b/src/components/views/rooms/ThreadSummary.tsx
@@ -138,7 +138,6 @@ export const ThreadMessagePreview: React.FC<IPreviewProps> = ({ thread, showDisp
                     className="mx_ThreadSummary_content mx_DecryptionFailureBody"
                     title={_t("timeline|decryption_failure|unable_to_decrypt")}
                 >
-<<<<<<< HEAD
                     { /* :TCHAP: better-text-for-locked-messages - <span className="mx_ThreadSummary_message-preview">{_t("threads|unable_to_decrypt")}</span>*/}
                     <span className="mx_ThreadSummary_message-preview">
                         {_t("threads|unable_to_decrypt_with_info_message", {},
@@ -153,11 +152,6 @@ export const ThreadMessagePreview: React.FC<IPreviewProps> = ({ thread, showDisp
                     </span>
                     {/** end :TCHAP: */}
 
-=======
-                    <span className="mx_ThreadSummary_message-preview">
-                        {_t("timeline|decryption_failure|unable_to_decrypt")}
-                    </span>
->>>>>>> v3.100.0-rc.0
                 </div>
             ) : (
                 <div className="mx_ThreadSummary_content" title={preview}>