updated submodules
fix conflict w submodule