diff --git a/SRC/MEStc_SXS/MEStc_SXS.csproj b/SRC/MEStc_SXS/MEStc_SXS.csproj
index 5498661..e04108c 100644
--- a/SRC/MEStc_SXS/MEStc_SXS.csproj
+++ b/SRC/MEStc_SXS/MEStc_SXS.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -59,20 +58,17 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
-    <Reference
-      Include="data_access_service, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="data_access_service, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MES_S_DLL\data_access_service.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference
-      Include="iMESAppSetting, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="iMESAppSetting, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MES_S_DLL\iMESAppSetting.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference
-      Include="iMESComSubroutine, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="iMESComSubroutine, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MES_S_DLL\iMESComSubroutine.dll</HintPath>
       <Private>False</Private>
@@ -115,8 +111,8 @@
     <Import Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="21684tcENT\clsENT21684.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+<<<<<<< HEAD
 
     <Compile Include="tcENT_21674\clsENT_21674.cs" />
     <Compile Include="tcENT\clsENT.cs" />
@@ -128,18 +124,30 @@
     <Compile Include="tcENT\clsA.cs" />
     <Compile Include="tcENT\clsENT.cs" />
     <Compile Include="tcTEST21706\clsENT21706.cs" />
+=======
+    <Compile Include="tc21690\clsENT21690.cs" />
+    <Compile Include="tcENT\clsENT.cs" />
+
+
+    <Compile Include="tcTEST21706\clsENT21706.cs" />
+
+>>>>>>> 4457514143578b10651b4b78f93b8bc6778f4a61
 
     <Compile Include="tcTWEST21671\tcTEST_21671.cs" />
 
     <Compile Include="tcTEST21703\clsTEST_21703.cs" />
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 4457514143578b10651b4b78f93b8bc6778f4a61
     <Compile Include="tcENT_21681\clsENT_21681.cs" />
     <Compile Include="tcTest21681\clsTest21681.cs" />
     <Compile Include="tcTEST14278\clsTest_14278.cs" />
 
 
+
     <Compile Include="tcWIP\clsLot.cs" />
-    <Compile Include="tc_21685\clsENT_21685.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="shared file\" />
@@ -152,6 +160,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <Import Project="..\MESWin\shared file\MakeVersion_CS.targets"
-    Condition="exists('..\MESWin\shared file\MakeVersion_CS.targets')" />
+  <Import Project="..\MESWin\shared file\MakeVersion_CS.targets" Condition="exists('..\MESWin\shared file\MakeVersion_CS.targets')" />
 </Project>
\ No newline at end of file
diff --git a/SRC/wsSXS/wsSXS.csproj b/SRC/wsSXS/wsSXS.csproj
index fb0a7fd..4b1ecf3 100644
--- a/SRC/wsSXS/wsSXS.csproj
+++ b/SRC/wsSXS/wsSXS.csproj
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
-    Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -65,14 +63,12 @@
       <HintPath>..\MES_S_DLL\MEStc_SXS.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
-    <Reference
-      Include="iMESAppSetting, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="iMESAppSetting, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MES_S_DLL\iMESAppSetting.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference
-      Include="iMESComSubroutine, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="iMESComSubroutine, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MES_S_DLL\iMESComSubroutine.dll</HintPath>
       <Private>False</Private>
@@ -101,8 +97,7 @@
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference
-      Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MES_S_DLL\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
@@ -150,6 +145,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+<<<<<<< HEAD
 
     <Compile Include="wsENT21706\wsENT_21706.cs" />
 
@@ -177,6 +173,11 @@
 
     <Compile Include="wxENT_21685\ws_21685.cs" />
     <Compile Include="wsENT\wsENT.cs" />
+=======
+    <Compile Include="ws21690\wsENT.cs" />
+    <Compile Include="wsWIP\wsWIP.cs" />
+    <Compile Include="wxENT\wsENT21690.cs" />
+>>>>>>> 4457514143578b10651b4b78f93b8bc6778f4a61
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources.resx">
@@ -206,6 +207,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <Import Project="..\MESWin\shared file\MakeVersion_CS.targets"
-    Condition="exists('..\MESWin\shared file\MakeVersion_CS.targets')" />
+  <Import Project="..\MESWin\shared file\MakeVersion_CS.targets" Condition="exists('..\MESWin\shared file\MakeVersion_CS.targets')" />
 </Project>
\ No newline at end of file
diff --git a/SRC/wsSXS/wsSXS.csproj.user b/SRC/wsSXS/wsSXS.csproj.user
index aae203c..6ffef2c 100644
--- a/SRC/wsSXS/wsSXS.csproj.user
+++ b/SRC/wsSXS/wsSXS.csproj.user
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+<<<<<<< HEAD
     <ReferencePath>D:\Program Files\work\GitProject\SRC\MES_S_DLL\</ReferencePath>
+=======
+<<<<<<< HEAD
+    <ReferencePath>E:\code\SRC\MES_S_DLL\</ReferencePath>
+    <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
+
+>>>>>>> 4457514143578b10651b4b78f93b8bc6778f4a61
   </PropertyGroup>
 </Project>
\ No newline at end of file