diff --git a/BO/BO.csproj b/BO/BO.csproj
index 808886f..430ec80 100644
--- a/BO/BO.csproj
+++ b/BO/BO.csproj
@@ -713,13 +713,7 @@
     <Content Include="Views\user\LeaveHistory.cshtml" />
     <Content Include="Views\Shared\Partial\UserBoxSelect.cshtml" />
     <Content Include="Views\cm\cmregexset.cshtml" />
-<<<<<<< HEAD
-    <None Include="Web.Staging.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </None>
-=======
     <Content Include="Web.Staging.config" />
->>>>>>> 8c571ed (추가개발2)
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
diff --git a/BO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/BO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 190c934..bc2ce24 100644
Binary files a/BO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/BO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/FO/FO.csproj b/FO/FO.csproj
index 544e9f6..4c55af2 100644
--- a/FO/FO.csproj
+++ b/FO/FO.csproj
@@ -758,17 +758,13 @@
     <Content Include="Views\Course\SmartSearch.cshtml" />
     <Content Include="Views\Account\FindIDPW.cshtml" />
     <Content Include="Views\Account\NewPassword.cshtml" />
-    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
-    <None Include="Web.Develop.config">
+    <Content Include="Properties\PublishProfiles\FolderProfile.pubxml" />
+    <Content Include="Web.Develop.config">
       <DependentUpon>Web.config</DependentUpon>
-    </None>
-<<<<<<< HEAD
-    <None Include="Web.Staging.config">
+    </Content>
+    <Content Include="Web.Staging.config">
       <DependentUpon>Web.config</DependentUpon>
-    </None>
-=======
-    <None Include="Web.Staging.config" />
->>>>>>> 8c571ed (추가개발2)
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Base\Base.csproj">
diff --git a/FO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/FO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 164d941..dc325f4 100644
Binary files a/FO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/FO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/FO/obj/Debug/FO.csproj.AssemblyReference.cache b/FO/obj/Debug/FO.csproj.AssemblyReference.cache
index a039a88..f5e894a 100644
Binary files a/FO/obj/Debug/FO.csproj.AssemblyReference.cache and b/FO/obj/Debug/FO.csproj.AssemblyReference.cache differ