diff --git a/pywxdump/wx_core/utils/common_utils.py b/pywxdump/wx_core/utils/common_utils.py
index c49b04f..7b899e3 100644
--- a/pywxdump/wx_core/utils/common_utils.py
+++ b/pywxdump/wx_core/utils/common_utils.py
@@ -11,20 +11,15 @@ import hmac
 import sys
 import traceback
 import hashlib
-<<<<<<< HEAD:pywxdump/wx_info/utils.py
-=======
 from ._loger import wx_core_loger
->>>>>>> ta:pywxdump/wx_core/utils/common_utils.py
+
 if sys.platform == "win32":
     from win32com.client import Dispatch
 else:
     Dispatch = None
 
-<<<<<<< HEAD:pywxdump/wx_info/utils.py
-def info_error(func):
-=======
+
 def wx_core_error(func):
->>>>>>> ta:pywxdump/wx_core/utils/common_utils.py
     """
     错误处理装饰器
     :param func:
@@ -34,15 +29,8 @@ def wx_core_error(func):
         try:
             return func(*args, **kwargs)
         except Exception as e:
-<<<<<<< HEAD:pywxdump/wx_info/utils.py
-            traceback_data = traceback.format_exc()
-            rdata = f"{traceback_data}"
-            print(f"info_error: \n{rdata}")
-            return "None"
-=======
             wx_core_loger.error(f"wx_core_error: {e}", exc_info=True)
             return None
->>>>>>> ta:pywxdump/wx_core/utils/common_utils.py
     return wrapper