this re-does the merge, but selectively and in the opposite direction (so
i finally have the submodules)