more submodule merging