merge conflict w upstream fixed in traffic_spy