diff --git a/ZR.Service/System/CommonLangService.cs b/ZR.Service/System/CommonLangService.cs
index 44a86fcc..c4660b32 100644
--- a/ZR.Service/System/CommonLangService.cs
+++ b/ZR.Service/System/CommonLangService.cs
@@ -110,11 +110,7 @@ namespace ZR.Service.System
         /// <returns></returns>
         public (string, object, object) ImportCommonLang(List<CommonLang> list)
         {
-<<<<<<< HEAD
-            var x = Storageable(list)
-=======
             var x = Context.Storageable(list)
->>>>>>> d1108700e0ad43b6bfea3f9a79bbb14799a2d29c
                 .WhereColumns(it => new { it.LangKey, it.LangCode })
                 .ToStorage();
             x.AsInsertable.ExecuteReturnSnowflakeIdList();//插入可插入部分;