# Conflicts: # src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java # src/main/java/com/bsth/data/gpsdata/GpsRealData.java # src/main/resources/application-dev.properties
