add SAML test
fix conflicts