add work in progrees dir, need sorting in profiles
fix conflict of strange samba dir name after merge