Resolve more rebase conflicts

packages/@okta/vuepress-site/docs/guides/add-an-external-idp/main/index.md

@@ -29,11 +29,11 @@ Okta manages the connection to the IdP for your app. The connection sits between
 
 > **Note:** Okta also supports other services such as directories and credential providers. See the [Okta Integration Network Catalog](https://www.okta.com/okta-integration-network/) to browse all integrations by use case.
 
-## Create an app at the IdP
+## Create an app at the Identity Provider
 
 <StackSnippet snippet="appatidp" />
 
-## Create an IdP in Okta
+## Create an Identity Provider in Okta
 
 To connect your org to the IdP, add and configure that IdP in Okta.
 
@@ -98,7 +98,7 @@ https://{yourOktaDomain}/oauth2/v1/authorize?idp={idp_id}&client_id={client_id}&
 
 ```
 
-## Use the IdP to sign in
+## Use the Identity Provider to sign in
 
 To test your authorization URL, enter the complete authorization URL in a browser. Do this in your browser's privacy or incognito mode to avoid false positive or negative results.
 
@@ -127,11 +127,7 @@ After the user clicks the link, they're prompted to sign in with the IdP. After
 ### Okta Sign-In Widget
 
 > **Note:** This section only applies to Classic Engine.<br>
-<<<<<<< HEAD
-> If you're using Identity Engine, the **Sign in with IdP** option is available on the widget. It's available after you [create an Identity Provider in your Okta org](#create-an-idp-in-okta) and configure the [routing rule](https://help.okta.com/okta_help.htm?id=ext-cfg-routing-rules). No additional code is required. See [Identify your Okta solution](https://help.okta.com/okta_help.htm?type=oie&id=ext-oie-version) to determine your Okta version and [Upgrade your widget](/docs/guides/oie-upgrade-sign-in-widget/main/#idp-discovery) for upgrade considerations to Identity Engine.
-=======
 > If you're using an Identity Engine org, the **Sign in with IdP** option is available on the widget after you [create an Identity Provider in your Okta org](#create-an-identity-provider-in-okta) and configure the [routing rule](https://help.okta.com/okta_help.htm?id=ext-cfg-routing-rules). No additional code is required. See [Identify your Okta solution](https://help.okta.com/okta_help.htm?type=oie&id=ext-oie-version) to determine your Okta version and [Upgrade your widget](/docs/guides/oie-upgrade-sign-in-widget/main/#idp-discovery) for upgrade considerations to Identity Engine.
->>>>>>> e042c9d92 (Edits to add-an-external-idp index)
 
 Okta also offers an easily embeddable JavaScript widget that reproduces the look and behavior of the standard Okta sign-in page. You can add a **Sign in with {IdentityProviderName}** button by adding the following code to your Okta Sign-In Widget configuration:
 
@@ -147,11 +143,7 @@ You can find out more about the Okta Sign-In Widget [on GitHub](https://github.c
 ### Custom Okta-hosted sign-in page
 
 > **Note:** This section only applies to Classic Engine.<br>
-<<<<<<< HEAD
-> If you're using Identity Engine, the **Sign in with IdP** option is available on the widget. It's available after you [create an Identity Provider in your Okta org](#create-an-idp-in-okta) and configure the [routing rule](https://help.okta.com/okta_help.htm?id=ext-cfg-routing-rules). See [Identify your Okta solution](https://help.okta.com/okta_help.htm?type=oie&id=ext-oie-version) to determine your Okta version.
-=======
 > If you're using Identity Engine, the **Sign in with IdP** option is available on Sign-In Widget after you [create an Identity Provider in your Okta org](#create-an-identity-provider-in-okta) and configure the [routing rule](https://help.okta.com/okta_help.htm?id=ext-cfg-routing-rules). See [Identify your Okta solution](https://help.okta.com/okta_help.htm?type=oie&id=ext-oie-version) to determine your Okta version.
->>>>>>> e042c9d92 (Edits to add-an-external-idp index)
 
 If you configured a [Sign-In Widget](/docs/guides/custom-widget/main/#style-the-okta-hosted-sign-in-widget), you can add a **Sign in with {IdentityProviderName}** button by adding the following code beneath the `var config = OktaUtil.getSignInWidgetConfig();` line:
 
@@ -164,11 +156,7 @@ config.idpDisplay ="SECONDARY";
 
 ### AuthJS
 
-<<<<<<< HEAD
 If you don't want pre-built views, or need deeper levels of customization, use the same AuthJS SDK that the Sign-In Widget is built with. See the [AuthJS GitHub repo](https://github.com/okta/okta-auth-js#install). Implementing sign in with an IdP uses the SDK's [OpenID Connect authentication flow](https://github.com/okta/okta-auth-js#openid-connect-options).
-=======
-If you don't want pre-built views, or need deeper levels of customization, then you can use the same AuthJS SDK that the Sign-In Widget is built with. For further information see [the AuthJS GitHub repo](https://github.com/okta/okta-auth-js#install). Implementing sign in with an Identity Provider uses the SDK's [OpenID Connect authentication flow](https://github.com/okta/okta-auth-js#openid-connect-options).
->>>>>>> e042c9d92 (Edits to add-an-external-idp index)
 
 ## Next steps