diff --git a/packages/renderer-core/src/hoc/leaf.tsx b/packages/renderer-core/src/hoc/leaf.tsx
index fe75a5ef9..d3692441b 100644
--- a/packages/renderer-core/src/hoc/leaf.tsx
+++ b/packages/renderer-core/src/hoc/leaf.tsx
@@ -399,11 +399,7 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
 
     /** 监听参数变化 */
     initOnPropsChangeEvent(leaf = this.leaf): void {
-<<<<<<< HEAD
-      const dispose = leaf?.onPropChange?.((propChangeInfo: PropChangeOptions) => {
-=======
       const dispose = leaf?.onPropChange?.(debounce((propChangeInfo: PropChangeOptions) => {
->>>>>>> feat/autoRepaintNode
         if (!this.autoRepaintNode) {
           return;
         }
@@ -453,11 +449,7 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
         });
 
         this.judgeMiniUnitRender();
-<<<<<<< HEAD
-      });
-=======
       }, 20));
->>>>>>> feat/autoRepaintNode
 
       dispose && this.disposeFunctions.push(dispose);
     }
diff --git a/packages/utils/src/start-transaction.ts b/packages/utils/src/start-transaction.ts
index c8cd9f26a..36d94e8af 100644
--- a/packages/utils/src/start-transaction.ts
+++ b/packages/utils/src/start-transaction.ts
@@ -27,8 +27,3 @@ class TransactionManager {
 }
 
 export const transactionManager = new TransactionManager();
-<<<<<<< HEAD
-
-export default transactionManager;
-=======
->>>>>>> feat/autoRepaintNode