diff --git a/modules/saml/lib/Message.php b/modules/saml/lib/Message.php
index bae83698334d8a9d82a7255040ff689e2fe360a7..7c1d5be68589aaf83009a59701b3c30d45bad3ec 100644
--- a/modules/saml/lib/Message.php
+++ b/modules/saml/lib/Message.php
@@ -478,7 +478,6 @@ class Message
             $nameIdPolicy = $spMetadata->getValue('NameIDPolicy');
         }
 
-<<<<<<< HEAD
         $policy = \SimpleSAML\Utils\Config\Metadata::parseNameIdPolicy($nameIdPolicy);
         if ($policy !== null) {
             // either we have a policy set, or we used the transient default