fix(api): resolve merge conflicts - keep shared session and defensive…

fix(api): resolve merge conflicts - keep shared session and defensive… #109