diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl
index 01369e5..4dbf993 100644
--- a/RPtoRFX_AppointmentEvent.ftl
+++ b/RPtoRFX_AppointmentEvent.ftl
@@ -28,10 +28,6 @@
 	    <#assign AddComma = false />
 		<#assign appointment = eventRP.data />
 	[
-<<<<<<< HEAD
-		<#if eventRP.commissionsUpdated>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedCommissions?? && eventRP.addedCommissions !="">
-=======
 		<#if appointment?? && (!(appointment.WMSCreated??) ||  !appointment.WMSCreated) &&  appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR>
 		{
 			<#assign apiRestReflexID = ApiRestReflexID.appointment_post_create>
@@ -42,7 +38,6 @@
 		<#else>
 			<#if eventRP.commissionsUpdated>
 				<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "">
->>>>>>> develop-1.2
 					<#if eventRP.appointmentCustomFields?has_content>
 					{
 						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
@@ -58,21 +53,12 @@
 						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
 					}
 					</#if>
-<<<<<<< HEAD
-				<#assign AddComma = true />
-				</#if>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedCommissions?? && eventRP.removedCommissions!="">
-				<#if AddComma == true>
-					   ,
-					</#if>	
-=======
 					<#assign AddComma = true />
 				</#if>
 				<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="">
 					<#if AddComma == true>
 						,
 					</#if>
->>>>>>> develop-1.2
 
 					<#if eventRP.appointmentCustomFields?has_content>
 					{