diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl
index cba4e33..4788e02 100644
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -63,8 +63,6 @@
 				<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
 				<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN")  >
 					<#if DeleteEF_Creation>
-<<<<<<< HEAD
-=======
 					[
 						{
 							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
@@ -74,7 +72,6 @@
 						}
 					]
 					<#else>
->>>>>>> develop
 					[
 						{
 							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
@@ -83,18 +80,6 @@
 							<#include "RFXtoRP_ExecutionflowDeleted.ftl">
 						}
 					]
-<<<<<<< HEAD
-					<#else>
-					[
-						{
-							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
-													"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-													"datas" :
-							<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
-						}
-					]
-=======
->>>>>>> develop
 					</#if>
 				<#else>
 				[