diff --git a/ccm-core/src/com/arsdigita/kernel/security/SamlLoginModule.java b/ccm-core/src/com/arsdigita/kernel/security/SamlLoginModule.java
index bd0e12ca0..3aa8aa07f 100644
--- a/ccm-core/src/com/arsdigita/kernel/security/SamlLoginModule.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/SamlLoginModule.java
@@ -55,6 +55,7 @@ public class SamlLoginModule implements LoginModule {
     @Override
     public boolean login() throws LoginException {
 
+<<<<<<< HEAD
         final HttpServletRequest httpRequest = getRequest();
         final HttpServletResponse httpResponse = getResponse();
 
@@ -64,6 +65,15 @@ public class SamlLoginModule implements LoginModule {
                             httpRequest,
                             httpResponse);
         } catch (SettingsException ex) {
+=======
+        final HttpServletRequest request = getRequest();
+        final HttpServletResponse response = getResponse();
+
+        final Auth auth;
+        try {
+            auth = new Auth(request, response);
+        } catch (IOException | SettingsException | Error ex) {
+>>>>>>> SAML support for CCM
             LOGGER.error("SAML Login failed.", ex);
             throw new LoginException("SAML Login failed. Configuration error?");
         }
@@ -87,7 +97,11 @@ public class SamlLoginModule implements LoginModule {
 
     @Override
     public boolean commit() throws LoginException {
+<<<<<<< HEAD
 
+=======
+        
+>>>>>>> SAML support for CCM
         if (userId != null) {
             subject.getPrincipals().add(new PartyPrincipal(userId));
         }
@@ -101,7 +115,6 @@ public class SamlLoginModule implements LoginModule {
 
     @Override
     public boolean logout() throws LoginException {
-
         getRequest().getSession().invalidate();
         return true;
     }
@@ -148,5 +161,4 @@ public class SamlLoginModule implements LoginModule {
             );
         }
     }
-
 }