merge submodules to master