ESPs and CDPs Collided – Now What?