diff --git a/BO/BO.csproj.user b/BO/BO.csproj.user
index 2cae1df..50b91b8 100644
--- a/BO/BO.csproj.user
+++ b/BO/BO.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Staging|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>false</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/FO/FO.csproj b/FO/FO.csproj
index aaba7d3..74afd58 100644
--- a/FO/FO.csproj
+++ b/FO/FO.csproj
@@ -762,9 +762,13 @@
     <Content Include="Web.Develop.config">
       <DependentUpon>Web.config</DependentUpon>
     </Content>
+<<<<<<< HEAD
     <None Include="Web.Staging.config">
+=======
+    <Content Include="Web.Staging.config">
+>>>>>>> 83caf9f (추가개발12/02_4)
       <DependentUpon>Web.config</DependentUpon>
-    </None>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Base\Base.csproj">
diff --git a/FO/FO.csproj.user b/FO/FO.csproj.user
index 3413a65..4b23dd5 100644
--- a/FO/FO.csproj.user
+++ b/FO/FO.csproj.user
@@ -11,29 +11,5 @@
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
   </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <StartPageUrl>
-          </StartPageUrl>
-          <StartAction>CurrentPage</StartAction>
-          <AspNetDebugging>True</AspNetDebugging>
-          <SilverlightDebugging>False</SilverlightDebugging>
-          <NativeDebugging>False</NativeDebugging>
-          <SQLDebugging>False</SQLDebugging>
-          <ExternalProgram>
-          </ExternalProgram>
-          <StartExternalURL>
-          </StartExternalURL>
-          <StartCmdLineArguments>
-          </StartCmdLineArguments>
-          <StartWorkingDirectory>
-          </StartWorkingDirectory>
-          <EnableENC>True</EnableENC>
-          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
+  <ProjectExtensions />
 </Project>
\ No newline at end of file