diff --git a/Project2/Debug/Project2.log b/Project2/Debug/Project2.log
index 9b540de..976bffc 100644
--- a/Project2/Debug/Project2.log
+++ b/Project2/Debug/Project2.log
@@ -1,6 +1,2 @@
-  linked_list.c
-C:\code\lencode\Project2\linked_list.c(31,24): warning C4028: 形参 1 与声明不同
-C:\code\lencode\Project2\linked_list.c(59,2): warning C4047: “return”:“address_node *”与“int”的间接级别不同
-  sq_list.c
-  正在生成代码...
+  sq_list.c
   Project2.vcxproj -> C:\code\lencode\Project2\Debug\Project2.exe
diff --git a/Project2/Debug/Project2.tlog/CL.command.1.tlog b/Project2/Debug/Project2.tlog/CL.command.1.tlog
index 966e035..63d0292 100644
Binary files a/Project2/Debug/Project2.tlog/CL.command.1.tlog and b/Project2/Debug/Project2.tlog/CL.command.1.tlog differ
diff --git a/Project2/Debug/Project2.tlog/CL.read.1.tlog b/Project2/Debug/Project2.tlog/CL.read.1.tlog
index 0a8cf83..161a884 100644
Binary files a/Project2/Debug/Project2.tlog/CL.read.1.tlog and b/Project2/Debug/Project2.tlog/CL.read.1.tlog differ
diff --git a/Project2/Debug/Project2.tlog/CL.write.1.tlog b/Project2/Debug/Project2.tlog/CL.write.1.tlog
index 578eaa4..cd2bbd5 100644
Binary files a/Project2/Debug/Project2.tlog/CL.write.1.tlog and b/Project2/Debug/Project2.tlog/CL.write.1.tlog differ
diff --git a/Project2/Debug/Project2.tlog/link.read.1.tlog b/Project2/Debug/Project2.tlog/link.read.1.tlog
index d16d14d..4b35156 100644
Binary files a/Project2/Debug/Project2.tlog/link.read.1.tlog and b/Project2/Debug/Project2.tlog/link.read.1.tlog differ
diff --git a/sq_list.c b/sq_list.c
index 3068bb9..658c42f 100644
--- a/sq_list.c
+++ b/sq_list.c
@@ -80,36 +80,37 @@ void print_sq_list(sq_list* list)
 // 2 �� 1
 void merge_sq_list(sq_list* list_1, sq_list* list_2)
 {
-    if (list_1->data == 0 || list_2->length == 0)
+    if (list_1->length == 0 || list_2->length == 0)
     {
         printf("��һ���ձ�\n");
         return;
     }
-    if ((list_1->length + list_1->length) > MAX)
+    if ((list_1->length + list_2->length) > MAX)
         printf("�ܺͳ���Χ\n���ǻ�����ϲ�ֻ��������Ϊ����ϲ�\n");
-    int flog = list_2->length;
+    int flog = 0;
     for (int i = 0; i < list_2->length; i++)
     {
         
-        for (int j = 0; j < list_1->length; j++) {
+        for (int j = 0; j < list_1->length; j++) 
+        {
             if (list_1->data[j] != list_2->data[i])
                 continue;
-            else if (list_1->data[j] != list_2->data[i])
-                break;
+            else if (list_1->data[j] == list_2->data[i])
+            {
+                flog++; break;
+            }
             else
             {
                 list_1->data[list_1->length] = list_2->data[i];
                 list_1->length++;
-                flog--;
-                break;
             }
         }
         
     }
-    printf("��%d����ͬ ��%d��ͬ\n", flog, list_2->length - flog);
+    printf("��%d��ͬ ��%d����ͬ\n", flog, list_2->length - flog);
 }
 
-/*ist_1->data[list_1->length] = list_2->data[i];
-list_1->length++;
-flog--;
-break;*/
\ No newline at end of file
+//if (list_1->data[j] != list_2->data[i])
+//continue;
+//else if (list_1->data[j] == list_2->data[i])
+//break;
\ No newline at end of file