diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
index 552dbde..1767476 100644
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
@@ -2419,6 +2419,9 @@ Fine-Design_Form_Watermark_Gap=Watermark Gap
 Fine-Design_Basic_Remote_Design_Choose_Custom=Choose Design Custom
 Fine-Design_Update_Info_Information=prompt message 
 Fine-Design_Form_Functional_When_Unactivated=Widget is selectable
+<<<<<<<<< Temporary merge branch 1
 Fine-Designer_PC_Fit_Attr=Browser adaptive attr
 Fine-Designer_PC_Element_Case_Fit_Attr=Browser ElementCase adaptive attr
-Fine-Design_Report_Mobile_Attr_Allow_Zoom=Allow double click/two finger zoom
\ No newline at end of file
+=========
+Fine-Design_Report_Mobile_Attr_Allow_Zoom=Allow double click/two finger zoom
+>>>>>>>>> Temporary merge branch 2
diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
index 87ec1a7..41b26dd 100644
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
@@ -2429,7 +2429,7 @@ Fine-Design_Vcs_Clean_Progress=Clean Progress
 Fine-Design_Form_Watermark_Gap=Watermark Gap
 Fine-Design_Basic_Remote_Design_Choose_Custom=choose design custom roles
 Fine-Design_Update_Info_Information=Please save the existing work content, the update will automatically restart the designer, whether to update
-Fine-Design_Form_Functional_When_Unactivated=Widget Is Selectable
 Fine-Designer_PC_Fit_Attr=PC Adaptive Attr
 Fine-Designer_PC_Element_Case_Fit_Attr=PC element adaptive attr
+Fine-Design_Form_Functional_When_Unactivated=Widget is selectable
 Fine-Design_Report_Mobile_Attr_Allow_Zoom=Allow double click/two finger zoom
\ No newline at end of file