update traffic
fix conflict