Resolved Merge Conflicts again

nefed.xml

@@ -18946,16 +18946,6 @@ bHwSoBy5hLPNALaEUoa5zPDwlixwRjFQTc5XXaRpgIjy/2gsL8+Y5QRhyXnLqgO67BlLYW/GuHE=</ds
               </ds:X509Data>
             </ds:KeyInfo>
           </KeyDescriptor>
-<<<<<<< HEAD
-=======
-          <KeyDescriptor use="encryption">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-              <ds:X509Data>
-                <ds:X509Certificate>MIICvDCCAaSgAwIBAgIIYjYVGQP8TjgwDQYJKoZIhvcNAQELBQAwHjEcMBoGA1UEAwwTdXMtZWFzdC0xX05tWUhna0NPbjAeFw0yMjA3MTExOTU0MDZaFw0zMjA3MTExOTU0MDZaMB4xHDAaBgNVBAMME3VzLWVhc3QtMV9ObVlIZ2tDT24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDP/XBKlUMXUMPsMryh9npr7ltt/8hTV17Fihspk0DCaw2D730kdw0ys6utQb15h8naNLt7WLKqXINFJJdKL/cklDGuHwptHz0ldlpoNZromAJXz6sg0TMkw15GL/DPWfAI2DrxjLZX3MKLj3UUHMLe8UwVoEiYx5cFGOfzkRFrfsDI/ufUCsEUmKHPHFIVO4e1PsB5zpZu5f9L0RTDXsiS6GuFdqpCEfV2Ne8w11ce/YU4hnmZi1zeFdNTVZiG8ewP8DKLpI4mWQC6iqGshZ+yTU19TDTTIUJdMq1Uvj+Q/QYhwJmCOU/wu0uCP9G8BB/YhZGFepkhK6X8G3eHCHpRAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEK0HHlqDkp+/tfoxid8ur6rVv8FZ/+HCZ6sUXiCX721W9qGBQE0UUvfy9UPe/KDzNKKC4Ov8HJAChQBsF6n76PUzeXNlFAGNqleiw8CSgQZHgLtp8Y6NsN4akJkqYwwIirgLMb6G/xMv+NiVBk4aGOstZIXmSWufZRrc/jlZOIMJtvMd89WjYkvVfntAD9PGgR9kUQGBBXcxvEvUtKyTurOSf9+3T+QwvCM6t5/G9NL9kug6mT4OkmI3HsByDj1uDvyCbOhqU7tC07iprQUNVTtEL8h/Dk9eCEq8qE6IYQ3EAe3fsI+9pzhVYTe2TxsTVeNe8iBYV+/cvWD8dYN6l8=</ds:X509Certificate>
-              </ds:X509Data>
-            </ds:KeyInfo>
-          </KeyDescriptor>
->>>>>>> master
           <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://playauth.fusionfamily.com/saml2/logout" />
           <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
           <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://playauth.fusionfamily.com/saml2/idpresponse" index="1" />
@@ -18982,8 +18972,6 @@ bHwSoBy5hLPNALaEUoa5zPDwlixwRjFQTc5XXaRpgIjy/2gsL8+Y5QRhyXnLqgO67BlLYW/GuHE=</ds
           <EmailAddress>security@nebraska.edu</EmailAddress>
         </ContactPerson>
       </EntityDescriptor>
-<<<<<<< HEAD
-=======
       <EntityDescriptor entityID="urn:auth0:watermarkinsights-production:universityofnebraskaomaha" xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
         <Extensions>
             <mdrpi:RegistrationInfo registrationAuthority="https://nebraska.edu/nefed" />
@@ -19281,5 +19269,4 @@ bHwSoBy5hLPNALaEUoa5zPDwlixwRjFQTc5XXaRpgIjy/2gsL8+Y5QRhyXnLqgO67BlLYW/GuHE=</ds
     <EmailAddress>mailto:support@zoom.us</EmailAddress>
   </ContactPerson>
   </EntityDescriptor>
->>>>>>> master
 </EntitiesDescriptor>
\ No newline at end of file