merge with idp + s