diff --git a/BO/BO.csproj b/BO/BO.csproj
index 3351e24..0e52674 100644
--- a/BO/BO.csproj
+++ b/BO/BO.csproj
@@ -711,12 +711,11 @@
     <Content Include="Views\croom\gradeall0_1.cshtml" />
     <Content Include="Views\croom\gradeupload.cshtml" />
     <Content Include="Views\user\LeaveHistory.cshtml" />
-<<<<<<< HEAD
-    <None Include="Web.Staging.config" />
-=======
     <Content Include="Views\Shared\Partial\UserBoxSelect.cshtml" />
     <Content Include="Views\cm\cmregexset.cshtml" />
->>>>>>> ca8967d (추가개발1)
+    <None Include="Web.Staging.config">
+      <DependentUpon>Web.config</DependentUpon>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
diff --git a/BO/bin/NP.Base.dll b/BO/bin/NP.Base.dll
index af75151..d5b5580 100644
Binary files a/BO/bin/NP.Base.dll and b/BO/bin/NP.Base.dll differ
diff --git a/BO/bin/NP.Dao.dll b/BO/bin/NP.Dao.dll
index ea61ab7..a7f99f3 100644
Binary files a/BO/bin/NP.Dao.dll and b/BO/bin/NP.Dao.dll differ
diff --git a/BO/bin/NP.Model.dll b/BO/bin/NP.Model.dll
index 02cd3cd..2e45e86 100644
Binary files a/BO/bin/NP.Model.dll and b/BO/bin/NP.Model.dll differ
diff --git a/BO/obj/Debug/BO.csproj.AssemblyReference.cache b/BO/obj/Debug/BO.csproj.AssemblyReference.cache
index 32c1931..cc36fa2 100644
Binary files a/BO/obj/Debug/BO.csproj.AssemblyReference.cache and b/BO/obj/Debug/BO.csproj.AssemblyReference.cache differ
diff --git a/BO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/BO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 92d0f0e..a1e28d4 100644
Binary files a/BO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/BO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ