diff --git a/Analysis/Program.cs b/Analysis/Program.cs
index a5111ad..0cccbe6 100644
Binary files a/Analysis/Program.cs and b/Analysis/Program.cs differ
diff --git a/Analysis/obj/x64/Debug/9.Analysis.csproj.FileListAbsolute.txt b/Analysis/obj/x64/Debug/9.Analysis.csproj.FileListAbsolute.txt
index 18eddea..6167755 100644
--- a/Analysis/obj/x64/Debug/9.Analysis.csproj.FileListAbsolute.txt
+++ b/Analysis/obj/x64/Debug/9.Analysis.csproj.FileListAbsolute.txt
@@ -211,6 +211,7 @@ C:\Users\zhengxuan.zhang\Desktop\奇瑞总装最新源码\Analysis\obj\x64\Debug
 C:\Users\zhengxuan.zhang\Desktop\奇瑞总装最新源码\Analysis\obj\x64\Debug\9.Analysis.csproj.Up2Date
 C:\Users\zhengxuan.zhang\Desktop\奇瑞总装最新源码\Analysis\obj\x64\Debug\NSAnalysis.exe
 C:\Users\zhengxuan.zhang\Desktop\奇瑞总装最新源码\Analysis\obj\x64\Debug\NSAnalysis.pdb
+<<<<<<< HEAD
 D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\Analysis\bin\x64\Debug\NLog.config
 D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\Analysis\bin\x64\Debug\NSAnalysis.exe.config
 D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\Analysis\bin\x64\Debug\NSAnalysis.exe
@@ -257,3 +258,6 @@ D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资
 D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\Analysis\obj\x64\Debug\9.Analysis.csproj.Up2Date
 D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\Analysis\obj\x64\Debug\NSAnalysis.exe
 D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\Analysis\obj\x64\Debug\NSAnalysis.pdb
+=======
+D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\Analysis\obj\x64\Debug\NSAnalysis.exe.config
+>>>>>>> b72914d4d39493d91b99d904356b5138f1917436