Merge pull request #5693 from himeshsiriwardana/fix-build-failure

fixed a merge conflict and a broken image resulting in a build failure

Author: himeshsiriwardana

en/identity-server/7.1.0/docs/assets/img/guides/actions/pre-issue-access-token-rule-configuration-in-ui.png

@@ -579,10 +579,7 @@ nav:
           - Configure OIDC flows:
               - Configure OIDC flows: guides/authentication/oidc/index.md
               - Discover OIDC endpoints: guides/authentication/oidc/discover-oidc-configs.md
-<<<<<<< HEAD
               - Dynamic Client Registration (DCR): guides/authentication/oidc/oauth-dynamic-client-registration.md
-=======
->>>>>>> 67e1d095305dbeae81309380740128c993b2e9cc
               - Implement login using the Authorization Code flow: guides/authentication/oidc/implement-auth-code.md
               - Implement login using the Authorization Code flow and PKCE: guides/authentication/oidc/implement-auth-code-with-pkce.md
               - Implement private key JWT client authentication for OIDC: guides/authentication/oidc/private-key-jwt-client-auth.md

en/identity-server/7.1.0/mkdocs.yml

@@ -576,7 +576,7 @@ You can specify exact values for these fields, such as a specific application as
 You can also combine rules using logical AND and OR operators.
 This approach gives you flexible and precise control over when to invoke a pre-issue access token action.
 
-![pre-issue-access-token-rule-configuration]({{base_path}}/assets/img/guides/actions/pre-issue-access-token-rule-configuration-in-ui.png){: width="650" style="display: block; margin: 0; border: 0px;"}
+![pre-issue-access-token-rule-configuration]({{base_path}}/assets/img/guides/actions/pre-issue-access-token-rule-configuration-in-ui.png)
 
 The above rule configuration translates logically to: