update dash and local
fix conflict