diff --git a/ci.json b/ci.json
index f9f8a5be93..b33d55cf01 100644
--- a/ci.json
+++ b/ci.json
@@ -1,8 +1,8 @@
 {
   "pkg": {
     "xuanxuan": {
-      "gitVersion": "1813fad0551a3cf89feb9bf81ee8dfe948705223",
-      "version": "9.2.2"
+      "gitVersion": "383b4e4630ead6f25559cbe8bc0cbf1a01b71c26",
+      "version": "9.3"
     },
     "zentaoext": {
       "gitRepo": "zentao/zentaoext"
diff --git a/db/standard/zentao21.6.1.sql b/db/standard/zentao21.6.1.sql
index c540736dbf..09428fde20 100644
--- a/db/standard/zentao21.6.1.sql
+++ b/db/standard/zentao21.6.1.sql
@@ -148,7 +148,7 @@ CREATE TABLE `im_message` (
   `index` int(11) unsigned NOT NULL DEFAULT 0,
   `type` enum('normal','broadcast','notify','bulletin','botcommand') NOT NULL DEFAULT 'normal',
   `content` text DEFAULT NULL,
-  `contentType` enum('text','plain','emotion','image','file','object','code') NOT NULL DEFAULT 'text',
+  `contentType` enum('text','plain','emotion','image','file','object','code','merge') NOT NULL DEFAULT 'text',
   `data` text DEFAULT NULL,
   `deleted` enum('0','1') NOT NULL DEFAULT '0',
   `legacy` tinyint(1) NOT NULL DEFAULT 0,