From ffd6a4ed780e3fc7e4bcae8957cf3a423772c747 Mon Sep 17 00:00:00 2001
From: Paul Butcher <paul.butcher@gmail.com>
Date: Mon, 18 Mar 2024 11:57:10 +0000
Subject: [PATCH] fix merge errors

---
 .../transformers/MarcXMLRecordTransformer.scala  |  5 -----
 .../marc/xml/data/MarcXMLRecordTest.scala        | 16 ++++++++--------
 .../MarcXMLRecordTransformerTest.scala           |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pipeline/transformer/transformer_marc_xml/src/main/scala/weco/pipeline/transformer/marc/xml/transformers/MarcXMLRecordTransformer.scala b/pipeline/transformer/transformer_marc_xml/src/main/scala/weco/pipeline/transformer/marc/xml/transformers/MarcXMLRecordTransformer.scala
index d2dda4dd3a..e938f12b3c 100644
--- a/pipeline/transformer/transformer_marc_xml/src/main/scala/weco/pipeline/transformer/marc/xml/transformers/MarcXMLRecordTransformer.scala
+++ b/pipeline/transformer/transformer_marc_xml/src/main/scala/weco/pipeline/transformer/marc/xml/transformers/MarcXMLRecordTransformer.scala
@@ -8,15 +8,10 @@ import weco.catalogue.internal_model.identifiers.{
 import weco.catalogue.internal_model.work.WorkState.Source
 import weco.catalogue.internal_model.work.{Work, WorkData}
 import weco.pipeline.transformer.marc.xml.data.MarcXMLRecord
-<<<<<<< HEAD
 import weco.pipeline.transformer.marc_common.logging.LoggingContext
 import weco.pipeline.transformer.marc_common.transformers.{
   MarcEdition,
   MarcElectronicResources,
-=======
-import weco.pipeline.transformer.marc_common.transformers.{
-  MarcEdition,
->>>>>>> main
   MarcInternationalStandardIdentifiers,
   MarcTitle
 }
diff --git a/pipeline/transformer/transformer_marc_xml/src/test/scala/weco/pipeline/transformer/marc/xml/data/MarcXMLRecordTest.scala b/pipeline/transformer/transformer_marc_xml/src/test/scala/weco/pipeline/transformer/marc/xml/data/MarcXMLRecordTest.scala
index 46ace587a9..8fb98a1306 100644
--- a/pipeline/transformer/transformer_marc_xml/src/test/scala/weco/pipeline/transformer/marc/xml/data/MarcXMLRecordTest.scala
+++ b/pipeline/transformer/transformer_marc_xml/src/test/scala/weco/pipeline/transformer/marc/xml/data/MarcXMLRecordTest.scala
@@ -51,7 +51,7 @@ class MarcXMLRecordTest extends AnyFunSpec with Matchers with LoneElement {
         MarcXMLRecord(
           <record>
             <datafield tag="321">
-              <subfield tag="a">1234-5678</subfield>
+              <subfield code="a">1234-5678</subfield>
             </datafield>
           </record>
         ).fieldsWithTag("123") shouldBe empty
@@ -147,10 +147,10 @@ class MarcXMLRecordTest extends AnyFunSpec with Matchers with LoneElement {
       MarcXMLRecord(
         <record>
           <datafield tag="655">
-            <subfield tag="x">Hello Mike</subfield>
+            <subfield code="x">Hello Mike</subfield>
           </datafield>
           <datafield tag="651">
-            <subfield tag="a">Hello Joe</subfield>
+            <subfield code="a">Hello Joe</subfield>
           </datafield>
         </record>
       ).subfieldsWithTags("655" -> "a", "651" -> "x") shouldBe empty
@@ -163,15 +163,15 @@ class MarcXMLRecordTest extends AnyFunSpec with Matchers with LoneElement {
       MarcXMLRecord(
         <record>
           <datafield tag="650">
-            <subfield tag="a">Hello Mike</subfield>
+            <subfield code="a">Hello Mike</subfield>
           </datafield>
           <datafield tag="655">
-            <subfield tag="a">Hello Robert</subfield>
-            <subfield tag="0">n93000068</subfield>
+            <subfield code="a">Hello Robert</subfield>
+            <subfield code="0">n93000068</subfield>
           </datafield>
           <datafield tag="651">
-            <subfield tag="a">Hello Joe</subfield>
-            <subfield tag="0">n93000065</subfield>
+            <subfield code="a">Hello Joe</subfield>
+            <subfield code="0">n93000065</subfield>
           </datafield>
         </record>
       ).subfieldsWithTags(
diff --git a/pipeline/transformer/transformer_marc_xml/src/test/scala/weco/pipeline/transformer/marc/xml/transformers/MarcXMLRecordTransformerTest.scala b/pipeline/transformer/transformer_marc_xml/src/test/scala/weco/pipeline/transformer/marc/xml/transformers/MarcXMLRecordTransformerTest.scala
index b623176167..2ed4086bdb 100644
--- a/pipeline/transformer/transformer_marc_xml/src/test/scala/weco/pipeline/transformer/marc/xml/transformers/MarcXMLRecordTransformerTest.scala
+++ b/pipeline/transformer/transformer_marc_xml/src/test/scala/weco/pipeline/transformer/marc/xml/transformers/MarcXMLRecordTransformerTest.scala
@@ -51,7 +51,7 @@ class MarcXMLRecordTransformerTest
           </datafield>
           <datafield tag ="856">
             <subfield code="y">Hampster Dance</subfield>
-            <subfield code="u">https://example.com/hamsterdance</subfield>
+            <subfield code="u">https://example.com/hampsterdance</subfield>
           </datafield>
         </record>
       )