fix merge conflicts

Author: tkalvas

application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java

@@ -243,9 +243,10 @@ void getRealtimeTripTimes() {
 
   @Test
   void getTripTimesOnNoServiceDayWithUseScheduleOption() {
-    Instant midnight = ServiceDateUtils
-      .asStartOfService(SERVICE_DATE, service.getTimeZone())
-      .toInstant();
+    Instant midnight = ServiceDateUtils.asStartOfService(
+      SERVICE_DATE,
+      service.getTimeZone()
+    ).toInstant();
 
     assertEquals(
       Optional.of(