diff --git a/packages/x6-plugin-clipboard/package.json b/packages/x6-plugin-clipboard/package.json
index 756f187d498..1da2818d1d5 100644
--- a/packages/x6-plugin-clipboard/package.json
+++ b/packages/x6-plugin-clipboard/package.json
@@ -1,10 +1,6 @@
 {
   "name": "@antv/x6-plugin-clipboard",
-<<<<<<< HEAD
-  "version": "2.1.1",
-=======
   "version": "2.1.2",
->>>>>>> master
   "description": "clipboard plugin for X6",
   "main": "lib/index.js",
   "module": "es/index.js",