diff --git a/app_base_chinese/models/res_partner.py b/app_base_chinese/models/res_partner.py
index 47fa0a46..6d5427bc 100644
--- a/app_base_chinese/models/res_partner.py
+++ b/app_base_chinese/models/res_partner.py
@@ -7,7 +7,7 @@ from odoo.exceptions import UserError, ValidationError
 class ResPartner(models.Model):
     _inherit = 'res.partner'
 
-    name = fields.Char(translate=False)
+    # name = fields.Char(translate=False)
     short_name = fields.Char('Short Name')  # 简称
     fax = fields.Char('Fax')  # 简称
 
diff --git a/app_base_chinese/static/description/index.html b/app_base_chinese/static/description/index.html
index 1fdb17a7..f427a954 100644
--- a/app_base_chinese/static/description/index.html
+++ b/app_base_chinese/static/description/index.html
@@ -17,7 +17,7 @@
 <section class="oe_container container">
     <div class="oe_row oe_spaced">
         <div class="row">
-            <h3>Latest update: v18.0.25.01.17</h3>
+            <h3>Latest update: v18.0.25.02.20</h3>
             <div class="oe_span12 oe_spaced">
                 <div class="alert alert-info" style="padding:8px;font-weight: 300; font-size: 20px;">
                     <i class="fa fa-hand-o-right"></i><b> Key features: </b>
@@ -188,4 +188,4 @@
     </div>
 </section>
 <!-- end support-->
-</html>
\ No newline at end of file
+</html>
diff --git a/l10n_cn_standard_latest/__manifest__.py b/l10n_cn_standard_latest/__manifest__.py
index 9c9f1a5f..cfb4b39e 100644
--- a/l10n_cn_standard_latest/__manifest__.py
+++ b/l10n_cn_standard_latest/__manifest__.py
@@ -9,7 +9,11 @@
 
 {
     'name': '2025最新中国会计科目表.企业标准会计.Latest Chinese Accounting for odoo18',
+<<<<<<< HEAD
     'version': '18.0.25.02.17',
+=======
+    'version': '18.0.25.02.18',
+>>>>>>> 45755625c75769f05f8e783700c875306e877cc0
     'author': 'odooai.cn',
     'category': 'Accounting/Localizations/Account Charts',
     'website': 'https://www.odooai.cn',
diff --git a/l10n_cn_standard_latest/models/account_journal.py b/l10n_cn_standard_latest/models/account_journal.py
index b7596cf8..b2bed399 100644
--- a/l10n_cn_standard_latest/models/account_journal.py
+++ b/l10n_cn_standard_latest/models/account_journal.py
@@ -15,6 +15,6 @@ class AccountJournal(models.Model):
         if hasattr(company, 'coa_delimiter'):
             delimiter = company.coa_delimiter
         code = code + delimiter + '01'
-        new_code = self.env['account.account']._search_new_account_code(code),
+        new_code = self.env['account.account']._search_new_account_code(code)
         res.update({'code': new_code})
         return res
diff --git a/l10n_cn_standard_latest/static/description/index.html b/l10n_cn_standard_latest/static/description/index.html
index 43c9038d..ecd9e10d 100644
--- a/l10n_cn_standard_latest/static/description/index.html
+++ b/l10n_cn_standard_latest/static/description/index.html
@@ -17,7 +17,11 @@
     <div class="oe_row oe_spaced">
         <div class="row">
             <div class="oe_row">
+<<<<<<< HEAD
                 <h3>Lastest update: v18.0.25.02.17</h3>
+=======
+                <h3>Lastest update: v18.25.02.18</h3>
+>>>>>>> 45755625c75769f05f8e783700c875306e877cc0
                 <div class="row">
                     <img class="oe_demo oe_screenshot img img-fluid" src="banner.png">
                 </div>