Edits to add-an-external-idp index

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

@@ -7,7 +7,7 @@ meta:
 
 ## <StackSnippet snippet="idp" inline />
 
-This document explains how to configure <StackSnippet snippet="idp" inline /> as an [external Identity Provider](/docs/concepts/identity-providers/) for your application by creating an application at <StackSnippet snippet="idp" inline />, creating an Identity Provider (IdP) in Okta, testing the configuration, and creating a sign-in button.
+This document explains how to configure <StackSnippet snippet="idp" inline /> as an [external Identity Provider](/docs/concepts/identity-providers/) for your app by creating an app at <StackSnippet snippet="idp" inline />, creating an Identity Provider (IdP) in Okta, testing the configuration, and creating a sign-in button.
 
 ---
 
@@ -71,7 +71,7 @@ Alternatively, you can use the authorize URL to simulate the authorization flow.
 
 > **Note:** Use this step to test your authorization URL as an HTML link. For information on testing your authorization URL using the Sign-In Widget, Okta-hosted sign-in page, or AuthJS, see the [next section](#use-the-identity-provider-to-sign-in).
 >
-> If you're using Authorization Code with PKCE as the grant type, you must generate and store the PKCE. See [Implement authorization by grant type](/docs/guides/implement-grant-type/authcodepkce/main/#flow-specifics). Okta recommends that you use the [AuthJS SDK](https://github.com/okta/okta-auth-js#signinwithredirectoptions) with this grant type.
+> If you use the Authorization Code with PKCE grant type, you must generate and store the PKCE. See [Implement authorization by grant type](/docs/guides/implement-grant-type/authcodepkce/main/#flow-specifics). Okta recommends that you use the [AuthJS SDK](https://github.com/okta/okta-auth-js#signinwithredirectoptions) with this grant type.
 
 In the URL, replace `{yourOktaDomain}` with your org's base URL, and then replace the following values:
 
@@ -127,7 +127,11 @@ 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:
 
@@ -143,7 +147,11 @@ 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:
 
@@ -156,7 +164,11 @@ 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