diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl
index 469b265..4dbf993 100644
--- a/RPtoRFX_AppointmentEvent.ftl
+++ b/RPtoRFX_AppointmentEvent.ftl
@@ -28,11 +28,7 @@
 	    <#assign AddComma = false />
 		<#assign appointment = eventRP.data />
 	[
-<<<<<<< HEAD
 		<#if appointment?? && (!(appointment.WMSCreated??) ||  !appointment.WMSCreated) &&  appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR>
-=======
-		<#if appointment?? && appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR>
->>>>>>> f602f74 (SCPN1-10471)
 		{
 			<#assign apiRestReflexID = ApiRestReflexID.appointment_post_create>
 			"apiRestReflexID" :  "${apiRestReflexID}",
@@ -41,7 +37,7 @@
 		}
 		<#else>
 			<#if eventRP.commissionsUpdated>
-				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "">
+				<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "">
 					<#if eventRP.appointmentCustomFields?has_content>
 					{
 						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
@@ -58,54 +54,8 @@
 					}
 					</#if>
 					<#assign AddComma = true />
-<<<<<<< HEAD
 				</#if>
-				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="">
-					<#if AddComma == true>
-						,
-					</#if>
-
-					<#if eventRP.appointmentCustomFields?has_content>
-					{
-						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_number>
-						"apiRestReflexID" :  "${apiRestReflexID}",
-						"datas" :
-						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl">
-					}
-					<#else>
-					{
-						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_ref>
-						"apiRestReflexID" :  "${apiRestReflexID}",
-						"datas" :
-						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl">
-					}
-					</#if>
-					<#assign AddComma = true />
-				</#if>
-			</#if>	
-	<#-- *********************************************** Action = reasonUpdated or slotUpdated ******************** -->
-			<#if eventRP.reasonUpdated   || eventRP.slotUpdated  || eventRP.carrierInformationUpdated>
-				<#if AddComma == true>
-					,
-				</#if>
-				<#if eventRP.appointmentCustomFields?has_content>
-				{
-					<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
-					"apiRestReflexID" :  "${apiRestReflexID}",
-					"datas" :
-					<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl">
-				}
-				<#else>
-				{
-					<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref>
-					"apiRestReflexID" :  "${apiRestReflexID}",
-					"datas" :
-					<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
-				}
-=======
->>>>>>> f602f74 (SCPN1-10471)
-				</#if>
-				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="">
+				<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="">
 					<#if AddComma == true>
 						,
 					</#if>