diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl
index e9cf612..5f01e87 100644
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -8,20 +8,13 @@
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
-<<<<<<< HEAD
-
-=======
->>>>>>> develop
 <#assign aDateTime = .now>
 <#assign no_apiRestReflexID = "no apiRestReflexID">
 <#assign no_status = -99999>
 <#assign event = "UNKNOW_EVENT" >
-<<<<<<< HEAD
-=======
 <#-- DeleteEF_False a définir dans ce fichier -->
 <#-- DeleteEF_False to be defined in this file.-->
 <#include "InternalSettings.ftl">
->>>>>>> develop
 
 <#switch id.apiRestReflexID!no_apiRestReflexID>
 	<#case no_apiRestReflexID>
@@ -68,22 +61,8 @@
 			<#case 201>
 				<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 				<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
-<<<<<<< HEAD
-				<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
-				[
-					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
-						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						"datas" :
-						<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
-					}
-				]
-				<#else>
-					<#if preparationOrderPostResponse.status?? &&  preparationOrderPostResponse.status == "WARN">
-=======
 				<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN")  >
 					<#if DeleteEF_False>
->>>>>>> develop
 					[
 						{
 							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
@@ -95,23 +74,6 @@
 					<#else>
 					[
 						{
-<<<<<<< HEAD
-							<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-							<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							"datas" :
-							    <#assign event = "RP_EXECUTIONFLOW_EVENT">
-								<#include "RFXtoRP_PlatformLogCreate.ftl">
-						},
-						{
-							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							"datas" :
-								<#include "RFXtoRP_RestResponseAllocationError.ftl">
-						}
-					]
-					</#if>
-=======
 							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
 													"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 													"datas" :
@@ -136,7 +98,6 @@
 							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					}
 				]
->>>>>>> develop
 				</#if>
 			<#break>
 			<#default>