Resolve merge conflicts

Author: vpaturet

application/src/test/java/org/opentripplanner/updater/trip/siri/SiriEtBuilder.java

@@ -171,16 +171,6 @@ public SiriEtBuilder withEstimatedCalls(
     return this;
   }
 
-  public SiriEtBuilder withOccupancy(OccupancyEnumeration occupancy) {
-    evj.setOccupancy(occupancy);
-    return this;
-  }
-
-  public SiriEtBuilder withPredictionInaccurate(boolean predictionInaccurate) {
-    evj.setPredictionInaccurate(predictionInaccurate);
-    return this;
-  }
-
   public SiriEtBuilder withVehicleJourneyRef(String id) {
     var ref = new VehicleJourneyRef();
     ref.setValue(id);

application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java

@@ -316,9 +316,8 @@ void testAddJourneyWithPredictionInaccurate() {
       .buildEstimatedTimetableDeliveries();
 
     assertSuccess(siri.applyEstimatedTimetable(updates));
-    // PI overwrites the R (recorded) flag since StopRealTimeState is a single enum
     assertEquals(
-      "ADDED | C [PI] 0:02 0:02 | D [PI] 0:04 0:04",
+      "ADDED | C [R,PI] 0:02 0:02 | D [PI] 0:04 0:04",
       env.tripData(ADDED_TRIP_ID).showTimetable()
     );
   }

application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraThenCanceledJourneyTest.java

@@ -88,7 +88,7 @@ void testAddJourneyWithAllStopsCancelledIsImplicitlyCancelled() {
     assertSuccess(siri.applyEstimatedTimetable(updates));
     // Individual stop [C] flags remain even though the trip is implicitly cancelled
     assertEquals(
-      "CANCELED | A [C] 11:00 11:00 | B [C] 11:10 11:10",
+      "CANCELED | A [C,R] 11:00 11:00 | B [C] 11:10 11:10",
       env.tripData(ADDED_TRIP_ID).showTimetable()
     );
   }