diff --git a/FO/FO.csproj b/FO/FO.csproj
index 74afd58..06eff6a 100644
--- a/FO/FO.csproj
+++ b/FO/FO.csproj
@@ -762,11 +762,7 @@
     <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>
     </Content>
   </ItemGroup>
diff --git a/UpgradeLog2.htm b/UpgradeLog2.htm
new file mode 100644
index 0000000..e17de92
Binary files /dev/null and b/UpgradeLog2.htm differ