diff --git a/FO/FO.csproj.user b/FO/FO.csproj.user
index 7529c15..3334b14 100644
--- a/FO/FO.csproj.user
+++ b/FO/FO.csproj.user
@@ -10,11 +10,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-<<<<<<< HEAD
-    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
-=======
     <NameOfLastUsedPublishProfile>D:\Project\git\git_YNICTE\FO\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
->>>>>>> a30ad53 (추가개발0107_1)
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>