diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index 906eaabb6..fa1ee18e1 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -210,8 +210,6 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
 
   readonly viewport = new Viewport();
 
-  readonly scroller = this.designer.createScroller(this.viewport);
-
   mountViewport(viewport: Element | null) {
     this.viewport.mount(viewport);
   }
diff --git a/packages/editor-preset-vision/src/index.ts b/packages/editor-preset-vision/src/index.ts
index f27e95045..2dcc762a0 100644
--- a/packages/editor-preset-vision/src/index.ts
+++ b/packages/editor-preset-vision/src/index.ts
@@ -169,11 +169,6 @@ const version = '6.0.0 (LowcodeEngine 0.9.32)';
 
 console.log(
   `%c VisionEngine %c v${version} `,
-<<<<<<< HEAD
-  'padding: 2px 1px; border-radius: 3px 0 0 3px; color: #fff; background: #606060;font-weight:bold;',
-  'padding: 2px 1px; border-radius: 0 3px 3px 0; color: #fff; background: #42c02e;font-weight:bold;',
-=======
   'padding: 2px 1px; border-radius: 3px 0 0 3px; color: #fff; background: #606060; font-weight: bold;',
   'padding: 2px 1px; border-radius: 0 3px 3px 0; color: #fff; background: #42c02e; font-weight: bold;',
->>>>>>> origin/refactor/vision-code-split
 );
diff --git a/packages/react-simulator-renderer/.eslintrc.js b/packages/react-simulator-renderer/.eslintrc.js
index 39a7d9067..fe92a8086 100644
--- a/packages/react-simulator-renderer/.eslintrc.js
+++ b/packages/react-simulator-renderer/.eslintrc.js
@@ -12,6 +12,6 @@ module.exports = {
     'no-prototype-builtins': 0,
     'array-callback-return': 0,
     '@typescript-eslint/member-ordering': 0,
-    'react/no-find-dom-node', 0
+    'react/no-find-dom-node': 0,
   }
 }
\ No newline at end of file
diff --git a/packages/react-simulator-renderer/src/renderer.ts b/packages/react-simulator-renderer/src/renderer.ts
index 67df2b641..31c036956 100644
--- a/packages/react-simulator-renderer/src/renderer.ts
+++ b/packages/react-simulator-renderer/src/renderer.ts
@@ -394,11 +394,8 @@ export class SimulatorRendererContainer implements BuiltinSimulatorRenderer {
     // const node = host.currentDocument?.createNode(_schema);
     // _schema = node?.export(TransformStage.Render) || {};
 
-
-
     const renderer = this;
     const { componentsMap } = renderer;
-
     return getComponentController(schema, componentsMap);
   }
 
@@ -552,7 +549,6 @@ class ComponentCreator extends React.Component<{ schema: any; propsMap: any, com
     }
     const props = processPropsSchema(schema.props, propsMap, componentsMap);
     const _leaf = host.currentDocument?.createNode(schema);
-
     return createElement(ComponentClass, { ...props, _leaf }, children);
   }
 }
diff --git a/packages/types/src/value-type.ts b/packages/types/src/value-type.ts
index 8f05ae7a4..47904a6b7 100644
--- a/packages/types/src/value-type.ts
+++ b/packages/types/src/value-type.ts
@@ -105,10 +105,6 @@ export function isJSFunction(x: any): x is JSFunction {
   return typeof x === 'object' && x && x.type === 'JSFunction';
 }
 
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/refactor/vision-code-split
 export function isJSSlot(data: any): data is JSSlot {
   return data && data.type === 'JSSlot';
 }
diff --git a/packages/utils/src/build-components.ts b/packages/utils/src/build-components.ts
index 37c76580b..22bdba0a4 100644
--- a/packages/utils/src/build-components.ts
+++ b/packages/utils/src/build-components.ts
@@ -91,12 +91,12 @@ export function buildComponents(libraryMap: LibraryMap,
       components[componentName] = component;
     } else {
       component = findComponent(libraryMap, componentName, component);
-    }
-    if (component) {
-      if (!acceptsRef(component)) {
-        component = wrapReactClass(component as FunctionComponent);
+      if (component) {
+        if (!acceptsRef(component)) {
+          component = wrapReactClass(component as FunctionComponent);
+        }
+        components[componentName] = component;
       }
-      components[componentName] = component;
     }
   });
   return components;