merge square's submodules with mine