fix: conflict v3.114.0

package.json

@@ -1,15 +1,9 @@
 {
     "name": "matrix-react-sdk",
-<<<<<<< HEAD
     "version": "0.0.0",
-    "version-matrix": "3.113.0",
+    "version-matrix": "3.114.0",
     "description": "SDK for matrix.org using React for Tchap",
     "author": "DINUM",
-=======
-    "version": "3.114.0",
-    "description": "SDK for matrix.org using React",
-    "author": "New Vector Ltd.",
->>>>>>> v3.114.0
     "repository": {
         "type": "git",
         "url": "https://github.com/tchapgouv/matrix-react-sdk-tchap"
@@ -81,15 +75,10 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.12.5",
-<<<<<<< HEAD
-        "@matrix-org/analytics-events": "^0.25.0",
-        "@matrix-org/emojibase-bindings": "^1.1.2",
-        "@matrix-org/matrix-wysiwyg": "2.37.9",
-        "@matrix-org/olm": "3.2.15",
-=======
         "@matrix-org/analytics-events": "^0.26.0",
         "@matrix-org/emojibase-bindings": "^1.3.3",
->>>>>>> v3.114.0
+        "@matrix-org/matrix-wysiwyg": "2.37.9",
+        "@matrix-org/olm": "3.2.15",
         "@matrix-org/react-sdk-module-api": "^2.4.0",
         "@matrix-org/spec": "^1.7.0",
         "@sentry/browser": "^8.0.0",

test/components/views/settings/tabs/user/LabsUserSettingsTab-test.tsx

@@ -7,12 +7,8 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
-<<<<<<< HEAD
 import { render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-=======
-import { render, screen } from "jest-matrix-react";
->>>>>>> v3.114.0
 
 import LabsUserSettingsTab from "../../../../../../src/components/views/settings/tabs/user/LabsUserSettingsTab";
 import SettingsStore from "../../../../../../src/settings/SettingsStore";