fixade merge TrafficSystem