Resolve merge conflicts

Author: vpaturet

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

@@ -146,11 +146,6 @@ public SiriEtBuilder withVehicleMode(VehicleModesEnumeration mode) {
     return this;
   }
 
-  public SiriEtBuilder withPredictionInaccurate(boolean predictionInaccurate) {
-    evj.setPredictionInaccurate(predictionInaccurate);
-    return this;
-  }
-
   public SiriEtBuilder withRecordedCalls(
     Function<RecordedCallsBuilder, RecordedCallsBuilder> producer
   ) {