diff --git a/SRC/wsSXS/wsSXS.csproj.user b/SRC/wsSXS/wsSXS.csproj.user
index 3e43d15..1070918 100644
--- a/SRC/wsSXS/wsSXS.csproj.user
+++ b/SRC/wsSXS/wsSXS.csproj.user
@@ -6,19 +6,12 @@
 =======
 <<<<<<< HEAD
     <ReferencePath>E:\code\SRC\MES_S_DLL\</ReferencePath>
-<<<<<<< HEAD
 =======
 <<<<<<< HEAD
-=======
->>>>>>> 4457514143578b10651b4b78f93b8bc6778f4a61
     <ReferencePath>E:\code\SRC\MES_S_DLL\;E:\Project\digihua\iMES\SYS20240115\SRC\MES_S_DLL\;E:\Project\digihua\iMES\SYS20240115\SRC\MEStc_SXS\</ReferencePath>
 =======
     <ReferencePath>E:\VisualStudio_app\Digihua\iMES\MES_S_DLL\</ReferencePath>
 >>>>>>> 42de248d2d2ff29266f47df9261e045a7a3351b6
-<<<<<<< HEAD
 >>>>>>> 7a91e232e75dd451f6bd1a92477e646c49dca747
-=======
-
->>>>>>> 4457514143578b10651b4b78f93b8bc6778f4a61
   </PropertyGroup>
 </Project>
\ No newline at end of file