diff --git a/FO/FO.csproj b/FO/FO.csproj
index 6e2ebd4..aaba7d3 100644
--- a/FO/FO.csproj
+++ b/FO/FO.csproj
@@ -761,15 +761,10 @@
     <Content Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Web.Develop.config">
       <DependentUpon>Web.config</DependentUpon>
-<<<<<<< HEAD
     </Content>
-    <Content Include="Web.Staging.config" />
-=======
-    </None>
     <None Include="Web.Staging.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
->>>>>>> eab050b (추가개발01/02_3)
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Base\Base.csproj">
@@ -792,10 +787,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Develop|AnyCPU'">
     <OutputPath>bin\</OutputPath>
   </PropertyGroup>
-<<<<<<< HEAD
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Staging|AnyCPU'">
-    <OutputPath>bin\</OutputPath>
-=======
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Staging|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\</OutputPath>
@@ -804,7 +795,6 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
->>>>>>> eab050b (추가개발01/02_3)
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
diff --git a/FO/FO.csproj.user b/FO/FO.csproj.user
index 4851e27..3413a65 100644
--- a/FO/FO.csproj.user
+++ b/FO/FO.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>
     <ProjectView>ProjectFiles</ProjectView>
     <UseIISExpress>false</UseIISExpress>
     <Use64BitIISExpress />
diff --git a/UpgradeLog.htm b/UpgradeLog.htm
new file mode 100644
index 0000000..e17de92
Binary files /dev/null and b/UpgradeLog.htm differ