diff --git a/.vs/NFine.Framework/v17/.suo b/.vs/NFine.Framework/v17/.suo
index 890f90d..30d3ef7 100644
Binary files a/.vs/NFine.Framework/v17/.suo and b/.vs/NFine.Framework/v17/.suo differ
diff --git a/NFine.Web/NFine.Web.csproj b/NFine.Web/NFine.Web.csproj
index 7ce7eee..4ba897c 100644
--- a/NFine.Web/NFine.Web.csproj
+++ b/NFine.Web/NFine.Web.csproj
@@ -811,11 +811,8 @@
     <Content Include="Areas\PNSRM\Views\BicDoc_Publish\ICSBicDoc_Supplier.cshtml" />
     <Content Include="Areas\SRM\Views\PriceInquiry\VendorPersAddItem.cshtml" />
     <Content Include="Areas\SRM\Views\RCVList\Index.cshtml" />
-<<<<<<< HEAD
     <Content Include="Areas\PNSRM\Views\CreateItemLot\FormNew.cshtml" />
-=======
     <Content Include="Areas\PNSRM\Views\BicDoc_Publish\ICSBicDocByPO.cshtml" />
->>>>>>> ce3d82c9dfeecee1530f5da8bda239f52aca115e
     <None Include="Scripts\jquery-1.10.2.intellisense.js" />
     <Content Include="Scripts\jquery-1.10.2.js" />
     <Content Include="Scripts\jquery-1.10.2.min.js" />
diff --git a/NFine.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/NFine.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index c394ac8..8f1a122 100644
Binary files a/NFine.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/NFine.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/NFine.Web/obj/Debug/NFine.Web.csproj.AssemblyReference.cache b/NFine.Web/obj/Debug/NFine.Web.csproj.AssemblyReference.cache
index 607b546..22b8bc8 100644
Binary files a/NFine.Web/obj/Debug/NFine.Web.csproj.AssemblyReference.cache and b/NFine.Web/obj/Debug/NFine.Web.csproj.AssemblyReference.cache differ