diff --git a/nefed.xml b/nefed.xml
index 4a6f714a3b95105c9e4f34ee8d4c73eff0c95141..d638588e469f062aa177194f2db51f67a00fc008 100644
--- a/nefed.xml
+++ b/nefed.xml
@@ -29102,6 +29102,7 @@ Gk3Mp05d1eUmuSx+la30QAXkFgNXDP3Cp3JSKyG5A6EWjhXTyuNZcI/ffo6tjNWg
     <OrganizationDisplayName xml:lang="en">NSWERS Insights+</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">https://nswers.org/</OrganizationURL>
   </Organization>
+<<<<<<< HEAD
   <ContactPerson contactType="technical">
     <GivenName>David Hefley</GivenName>
     <EmailAddress>davidhefley@nebraska.edu</EmailAddress>
@@ -29119,6 +29120,8 @@ Gk3Mp05d1eUmuSx+la30QAXkFgNXDP3Cp3JSKyG5A6EWjhXTyuNZcI/ffo6tjNWg
     <GivenName>ITS Security</GivenName>
     <EmailAddress>security@nebraska.edu</EmailAddress>
   </ContactPerson>
+=======
+>>>>>>> master
 </EntityDescriptor>
     <EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
   xmlns:ds="http://www.w3.org/2000/09/xmldsig#"