update submodules
complete merge