resoving issue of departure and arrival
resolved conflicts