resolving merge conflict

.babelrc

@@ -1,4 +1,13 @@
 {
   "presets": ["@babel/preset-react", "@babel/preset-env"],
   "comments": false,
+  "plugins": [
+    [
+      "formatjs",
+      {
+        "idInterpolationPattern": "[sha512:contenthash:base64:6]",
+        "ast": true
+      }
+    ]
+  ]
 }

package.json

@@ -67,8 +67,8 @@
     "@babel/core": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
     "@babel/preset-react": "^7.12.10",
-    "@formatjs/cli": "^3.0.1",
     "babel-loader": "^8.2.2",
+    "babel-plugin-formatjs": "^9.0.2",
     "browserslist": "^4.16.1",
     "copy-webpack-plugin": "^6.4.1",
     "cssnano": "^4.1.10",

src/widgets/context-menu.jsx

@@ -108,7 +108,7 @@ class ContextMenu extends React.Component {
         handler: (params, errorHandler) => {
           return props.onShowAlert(
             formatMessage(messages.menu_item_clear_messages), // title
-            formatMessage(messages.clear_messages_warning), // content
+            formatMessage({id: 'clear_messages_warning'}), // content
             (() => { this.deleteMessages(true, false, params, errorHandler); }), // onConfirm
             null, // "OK"
             true, // Show Reject button
@@ -122,7 +122,7 @@ class ContextMenu extends React.Component {
         handler: (params, errorHandler) => {
           return props.onShowAlert(
             formatMessage(messages.menu_item_clear_messages_for_all), // title
-            formatMessage(messages.delete_messages_warning), // content
+            formatMessage({id: 'delete_messages_warning'}), // content
             (() => { return this.deleteMessages(true, true, params, errorHandler); }),
             null, // "OK"
             true, // Show Reject button
@@ -229,7 +229,7 @@ class ContextMenu extends React.Component {
       // menu_item_edit_permissions is defined elsewhere.
       'permissions': {
         id: 'permissions',
-        title: formatMessage(messages.menu_item_edit_permissions),
+        title: formatMessage({id: 'menu_item_edit_permissions'}),
         handler: null
       },
       'member_delete': {

umd/index.dev.js

@@ -7959,7 +7959,9 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
         id: 'messages_clear',
         title: formatMessage(messages.clear_messages),
         handler: (params, errorHandler) => {
-          return props.onShowAlert(formatMessage(messages.menu_item_clear_messages), formatMessage(messages.clear_messages_warning), () => {
+          return props.onShowAlert(formatMessage(messages.menu_item_clear_messages), formatMessage({
+            "id": "clear_messages_warning"
+          }), () => {
             this.deleteMessages(true, false, params, errorHandler);
           }, null, true, null);
         }
@@ -7968,7 +7970,9 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
         id: 'messages_clear_hard',
         title: formatMessage(messages.clear_for_all),
         handler: (params, errorHandler) => {
-          return props.onShowAlert(formatMessage(messages.menu_item_clear_messages_for_all), formatMessage(messages.delete_messages_warning), () => {
+          return props.onShowAlert(formatMessage(messages.menu_item_clear_messages_for_all), formatMessage({
+            "id": "delete_messages_warning"
+          }), () => {
             return this.deleteMessages(true, true, params, errorHandler);
           }, null, true, null);
         }
@@ -8061,7 +8065,9 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
       },
       'permissions': {
         id: 'permissions',
-        title: formatMessage(messages.menu_item_edit_permissions),
+        title: formatMessage({
+          "id": "menu_item_edit_permissions"
+        }),
         handler: null
       },
       'member_delete': {