NICTIZ-34243 Error laatste stap onderzoeken van ant build

Author: eyhlai

output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/properties.json

@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-<<<<<<< HEAD:output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Send/MA-script1.xml
    <id value="mp9-meddata-send-1-x"/>
    <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x"/>
    <version value="r4-mp9-3.0.0-beta-patchlevel 2025.31"/>
    <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MA-script1"/>
-=======
-   <id value="mp9-meddata-send-1-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.31"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MA-script1 - target Nictiz-intern"/>
->>>>>>> origin/MP9-3.0.0-rc.1:output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script1.xml
    <status value="active"/>
    <publisher value="Nictiz"/>
    <contact>

output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/properties.json

@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-<<<<<<< HEAD:output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Send/MA-script2.xml
    <id value="mp9-meddata-send-2-x"/>
    <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x"/>
    <version value="r4-mp9-3.0.0-beta-patchlevel 2025.31"/>
    <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MA-script2"/>
-=======
-   <id value="mp9-meddata-send-2-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.31"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MA-script2 - target Nictiz-intern"/>
->>>>>>> origin/MP9-3.0.0-rc.1:output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script2.xml
    <status value="active"/>
    <publisher value="Nictiz"/>
    <contact>