diff --git a/packages/demo/src/editor/components.ts b/packages/demo/src/editor/components.ts
index 003923a84..caa52a36f 100644
--- a/packages/demo/src/editor/components.ts
+++ b/packages/demo/src/editor/components.ts
@@ -2,12 +2,8 @@ import logo from '@ali/lowcode-plugin-sample-logo';
 import samplePreview from '@ali/lowcode-plugin-sample-preview';
 import undoRedo from '@ali/lowcode-plugin-undo-redo';
 import componentsPane from '@ali/lowcode-plugin-components-pane';
-<<<<<<< HEAD
 import outline, { OutlinePane } from '@ali/lowcode-plugin-outline-pane';
 import dataSourcePane from '@ali/lowcode-plugin-datasource-pane';
-=======
-import outline from '@ali/lowcode-plugin-outline-pane';
->>>>>>> origin/release/1.0.0
 import zhEn from '@ali/lowcode-plugin-zh-en';
 import eventBindDialog from '@ali/lowcode-plugin-event-bind-dialog';
 import variableBindDialog from '@ali/lowcode-plugin-variable-bind-dialog';
diff --git a/packages/demo/src/editor/config.ts b/packages/demo/src/editor/config.ts
index 7736c5e5a..bda055b0b 100644
--- a/packages/demo/src/editor/config.ts
+++ b/packages/demo/src/editor/config.ts
@@ -180,16 +180,11 @@ export default {
       const assets = await editor.utils.get('./assets.json');
       editor.set('assets', assets);
       const simulatorUrl = [
-<<<<<<< HEAD:packages/demo/src/editor/config.js
         'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/1.0.0/react-simulator-renderer.css',
-        'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/1.0.0/react-simulator-renderer.js',
-=======
-        'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/0.9.50/react-simulator-renderer.css',
-        //'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/0.9.50/react-simulator-renderer.js',
+        //'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/1.0.0/react-simulator-renderer.js',
         // for debug
          'http://localhost:3333/js/react-simulator-renderer.js',
         // 'http://localhost:3333/js/react-simulator-renderer.css',
->>>>>>> origin/release/1.0.0:packages/demo/src/editor/config.ts
       ];
       editor.set('simulatorUrl', simulatorUrl);
       editor.set('requestHandlersMap', {
diff --git a/packages/plugin-components-pane/package.json b/packages/plugin-components-pane/package.json
index 7213923f8..2049b9fd0 100644
--- a/packages/plugin-components-pane/package.json
+++ b/packages/plugin-components-pane/package.json
@@ -1,12 +1,7 @@
 {
   "name": "@ali/lowcode-plugin-components-pane",
-<<<<<<< HEAD
-  "version": "0.1.0-beta.0",
-  "description": "低代码引擎数据源配置面板",
-=======
   "version": "1.0.12",
   "description": "alibaba lowcode editor component-list plugin",
->>>>>>> origin/release/1.0.0
   "files": [
     "es/",
     "lib/"
diff --git a/packages/plugin-datasource-pane/package.json b/packages/plugin-datasource-pane/package.json
index 9484de9af..cbfc02d11 100644
--- a/packages/plugin-datasource-pane/package.json
+++ b/packages/plugin-datasource-pane/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ali/lowcode-plugin-datasource-pane",
-  "version": "0.1.0-beta.6",
+  "version": "1.0.12",
   "description": "低代码引擎数据源面板",
   "main": "lib/index.js",
   "files": [
diff --git a/packages/rax-render/package.json b/packages/rax-render/package.json
index 3968ba88b..702742d2d 100644
--- a/packages/rax-render/package.json
+++ b/packages/rax-render/package.json
@@ -36,11 +36,8 @@
     "@ali/b3-one": "^0.0.17",
     "@ali/bzb-request": "2.6.1",
     "@ali/lib-mtop": "^2.5.1",
-<<<<<<< HEAD
-    "@ali/lowcode-datasource-engine": "1.0.7-0",
-=======
+    "@ali/lowcode-datasource-engine": "^1.0.12",
     "@ali/lowcode-utils": "^1.0.12",
->>>>>>> origin/release/1.0.0
     "classnames": "^2.2.6",
     "debug": "^4.1.1",
     "events": "^3.0.0",
diff --git a/packages/rax-render/src/engine/base.tsx b/packages/rax-render/src/engine/base.tsx
index 428185525..bf9436a6e 100644
--- a/packages/rax-render/src/engine/base.tsx
+++ b/packages/rax-render/src/engine/base.tsx
@@ -87,34 +87,6 @@ export default class BaseEngine extends Component {
     console.warn(e);
   }
 
-<<<<<<< HEAD:packages/rax-render/src/engine/base.jsx
-=======
-  reloadDataSource = () => new Promise((resolve, reject) => {
-    debug('reload data source');
-    if (!this.__dataHelper) {
-      this.__showPlaceholder = false;
-      return resolve();
-    }
-    this.__dataHelper
-      .getInitData()
-      .then((res) => {
-        this.__showPlaceholder = false;
-        if (isEmpty(res)) {
-          this.forceUpdate();
-          return resolve();
-        }
-        this.setState(res, resolve);
-      })
-      .catch((err) => {
-        if (this.__showPlaceholder) {
-          this.__showPlaceholder = false;
-          this.forceUpdate();
-        }
-        reject(err);
-      });
-  });
-
->>>>>>> origin/release/1.0.0:packages/rax-render/src/engine/base.tsx
   __setLifeCycleMethods = (method, args) => {
     const lifeCycleMethods = getValue(this.props.__schema, 'lifeCycles', {});
     if (lifeCycleMethods[method]) {
diff --git a/packages/react-renderer/src/renderer/base.tsx b/packages/react-renderer/src/renderer/base.tsx
index cbee1107f..a67ccf3fd 100644
--- a/packages/react-renderer/src/renderer/base.tsx
+++ b/packages/react-renderer/src/renderer/base.tsx
@@ -83,34 +83,6 @@ export default class BaseRender extends PureComponent {
     console.warn(e);
   }
 
-<<<<<<< HEAD:packages/react-renderer/src/renderer/base.jsx
-=======
-  reloadDataSource = () => new Promise((resolve, reject) => {
-    debug('reload data source');
-    if (!this.__dataHelper) {
-      this.__showPlaceholder = false;
-      return resolve();
-    }
-    this.__dataHelper
-      .getInitData()
-      .then((res) => {
-        this.__showPlaceholder = false;
-        if (isEmpty(res)) {
-          this.forceUpdate();
-          return resolve();
-        }
-        this.setState(res, resolve);
-      })
-      .catch((err) => {
-        if (this.__showPlaceholder) {
-          this.__showPlaceholder = false;
-          this.forceUpdate();
-        }
-        reject(err);
-      });
-  });
-
->>>>>>> origin/release/1.0.0:packages/react-renderer/src/renderer/base.tsx
   __setLifeCycleMethods = (method, args) => {
     const lifeCycleMethods = getValue(this.props.__schema, 'lifeCycles', {});
     let fn = lifeCycleMethods[method];