add first dir
fix conflict