diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl
index 761d612..820fd8b 100644
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -40,11 +40,7 @@
                 "Value": "${dispute.dispute_amount}"
              },
             <#-- Claim metadata inclusion  -->
-<<<<<<< HEAD
-            <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">
-=======
             <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
->>>>>>> 17184ed (SCPN1-9059)
             <#-- To configure -->
             <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
             <#if dispute.dispute_type_code=="050" >