diff --git a/BO/Properties/PublishProfiles/FolderProfile.pubxml b/BO/Properties/PublishProfiles/FolderProfile.pubxml
index 6389391..e67b6d9 100644
--- a/BO/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/BO/Properties/PublishProfiles/FolderProfile.pubxml
@@ -3,19 +3,6 @@
 https://go.microsoft.com/fwlink/?LinkID=208121. 
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<<<<<<< HEAD
-	<PropertyGroup>
-		<!-- 배포 방식 지정 -->
-		<WebPublishMethod>FileSystem</WebPublishMethod>
-		<PublishProvider>FileSystem</PublishProvider>
-		<PublishUrl>C:\ProgramData\Jenkins\.jenkins\workspace\YNICTE_BO_Staging\publish\BO</PublishUrl>
-		<DeployOnBuild>true</DeployOnBuild>
-		<Configuration>Release</Configuration>
-
-		<!-- 특정 파일/폴더 제외 -->
-		<ExcludeFilesFromDeployment>Controllers\*.cs;Models\*.cs;App_Data\*</ExcludeFilesFromDeployment>
-	</PropertyGroup>
-=======
   <PropertyGroup>
     <!-- 배포 방식 지정 -->
     <WebPublishMethod>FileSystem</WebPublishMethod>
@@ -32,5 +19,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <DeleteExistingFiles>True</DeleteExistingFiles>
   </PropertyGroup>
->>>>>>> a30ad53 (추가개발0107_1)
 </Project>
\ No newline at end of file
diff --git a/FO/Properties/PublishProfiles/FolderProfile.pubxml b/FO/Properties/PublishProfiles/FolderProfile.pubxml
index fbcb405..f8926ac 100644
--- a/FO/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/FO/Properties/PublishProfiles/FolderProfile.pubxml
@@ -3,19 +3,6 @@
 https://go.microsoft.com/fwlink/?LinkID=208121. 
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<<<<<<< HEAD
-	<PropertyGroup>
-		<!-- 배포 방식 지정 -->
-		<WebPublishMethod>FileSystem</WebPublishMethod>
-		<PublishProvider>FileSystem</PublishProvider>
-		<PublishUrl>C:\ProgramData\Jenkins\.jenkins\workspace\YNICTE_FO_Staging\publish\FO</PublishUrl>
-		<DeployOnBuild>true</DeployOnBuild>
-		<Configuration>Staging</Configuration>
-
-		<!-- 특정 파일/폴더 제외 -->
-		<ExcludeFilesFromDeployment>Controllers\*.cs;Models\*.cs;App_Data\*</ExcludeFilesFromDeployment>
-	</PropertyGroup>
-=======
   <PropertyGroup>
     <!-- 배포 방식 지정 -->
     <WebPublishMethod>FileSystem</WebPublishMethod>
@@ -32,5 +19,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <DeleteExistingFiles>True</DeleteExistingFiles>
   </PropertyGroup>
->>>>>>> a30ad53 (추가개발0107_1)
 </Project>
\ No newline at end of file