fixing submodule after merge