add wd
fix conflict