Resolve "Update Support Contact for NSWERS"

Closes #353 (closed)

nefed.xml

@@ -29102,7 +29102,6 @@ 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>
@@ -29120,8 +29119,6 @@ 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#"