fix merge conflictsv0.7.5

1 files changed, 4 insertions, 5 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/export.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/export.scala
index 7f3c410..5febd8f 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/export.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/export.scala
@@ -1,22 +1,22 @@
 package xyz.driver.pdsuidomain.fakes.entities
 
 import xyz.driver.entities.labels.Label
-import xyz.driver.pdsuidomain.entities.{Arm, Criterion, Trial}
 import xyz.driver.pdsuidomain.entities.export.trial._
+import xyz.driver.pdsuidomain.entities.{Criterion, EligibilityArm, Trial}
 
 object export {
-  import xyz.driver.core.generators._
   import common._
+  import xyz.driver.core.generators._
 
   def nextExportTrialArm(): ExportTrialArm =
-    ExportTrialArm(armId = nextLongId[Arm], armName = nextString(100))
+    ExportTrialArm(armId = nextLongId[EligibilityArm], armName = nextString(100))
 
   def nextExportTrialLabelCriterion(): ExportTrialLabelCriterion =
     ExportTrialLabelCriterion(
       criterionId = nextLongId[Criterion],
       value = nextOption[Boolean](nextBoolean()),
       labelId = nextLongId[Label],
-      armIds = setOf(nextLongId[Arm]),
+      armIds = setOf(nextLongId[EligibilityArm]),
       criteria = nextString(100),
       isCompound = nextBoolean(),
       isDefining = nextBoolean()
@@ -26,7 +26,6 @@ object export {
     ExportTrialWithLabels(
       nctId = nextStringId[Trial],
       trialId = nextUuidId[Trial],
-      condition = nextString(100),
       lastReviewed = nextLocalDateTime,
       labelVersion = nextInt(100).toLong,
       arms = listOf(nextExportTrialArm()),