updated submodules names
fix conflict