[Upg] update submodules in order to avoid conflicts on merge