submodule updates and merges