Resolve merge conflicts

nefed.xml

@@ -29541,4 +29541,50 @@ and do *NOT* provide it in real time to your partners.
             <EmailAddress>security@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
+    <EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:auth0:relishiq:nebraskau-sso">
+        <Extensions>
+            <mdrpi:RegistrationInfo registrationAuthority="https://nebraska.edu/nefed" />
+            <mdattr:EntityAttributes>
+                <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+                    <saml:AttributeValue>https://nebraska.edu/category/registered-by-nefed</saml:AttributeValue>
+                </saml:Attribute>
+                <saml:Attribute Name="http://shibboleth.net/ns/attributes/releaseAllValues" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+                    <saml:AttributeValue>unNUID</saml:AttributeValue>
+                </saml:Attribute>
+            </mdattr:EntityAttributes>
+            <mdui:UIInfo>
+                <mdui:DisplayName xml:lang="en">Relish</mdui:DisplayName>
+                <mdui:Description xml:lang="en">Relish</mdui:Description>
+                <mdui:InformationURL xml:lang="en">https://relishiq.com/about-us/</mdui:InformationURL>
+                <mdui:PrivacyStatementURL xml:lang="en">https://relishiq.com/privacy-policy/</mdui:PrivacyStatementURL>
+                <mdui:Logo height="85" width="141" xml:lang="en"></mdui:Logo>
+            </mdui:UIInfo>
+        </Extensions>
+        <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+            <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nebraskau.apps.relishiq.com/auth/login-page" />
+            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://relishiq.us.auth0.com/logout" />
+            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://relishiq.us.auth0.com/login/callback?connection=nebraskau-sso" />
+        </SPSSODescriptor>
+        <Organization>
+            <OrganizationName xml:lang="en-US">RelishIQ LLC</OrganizationName>
+            <OrganizationDisplayName xml:lang="en-US">Relish</OrganizationDisplayName>
+            <OrganizationURL xml:lang="en-US">https://nebraskau.apps.relishiq.com/auth/login-page</OrganizationURL>
+        </Organization>
+        <ContactPerson contactType="technical">
+            <GivenName>Diego Salguero</GivenName>
+            <EmailAddress>diego@relishiq.com</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="administrative">
+            <GivenName>Roger Korth</GivenName>
+            <EmailAddress>rdkorth@nebraska.edu</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="support">
+            <GivenName>Roger Korth</GivenName>
+            <EmailAddress>rdkorth@nebraska.edu</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+            <GivenName>ITS Security</GivenName>
+            <EmailAddress>security@nebraska.edu</EmailAddress>
+        </ContactPerson>
+    </EntityDescriptor>
 </EntitiesDescriptor>