diff --git a/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl b/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl
index 784d148..e009cc6 100644
--- a/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl
@@ -12,10 +12,6 @@
 		<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
 		"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}",
 		"load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}",
-<<<<<<< HEAD
-       	<#switch appointment.AppointmentType>
-=======
->>>>>>> b1577d1 (SCPN1-10253)
 		<#switch appointment.AppointmentType>
 	       <#case "APPOINTMENT_TYPE_LOADING">
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
@@ -27,12 +23,6 @@
 				</#if>
 			<#break>
 		   <#case  "APPOINTMENT_TYPE_UNLOADING">
-<<<<<<< HEAD
-			   <#if appointment.TimeZone?? && appointment.TimeZone!="">
-		   		"unloading_appointment" : "true",
-				"load_appointment" : "false",
-=======
->>>>>>> b1577d1 (SCPN1-10253)
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",