From d43f88d796113dd57d41401a2378c707cf793775 Mon Sep 17 00:00:00 2001
From: lidiazuin <102308961+lidiazuin@users.noreply.github.com>
Date: Tue, 26 Jul 2022 21:53:19 +0200
Subject: [PATCH] 5.0 cherry-pick of 31

---
 modules/ROOT/pages/access-control/built-in-roles.adoc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/ROOT/pages/access-control/built-in-roles.adoc b/modules/ROOT/pages/access-control/built-in-roles.adoc
index b5c1de082..a21bd7aba 100644
--- a/modules/ROOT/pages/access-control/built-in-roles.adoc
+++ b/modules/ROOT/pages/access-control/built-in-roles.adoc
@@ -411,7 +411,11 @@ SHOW ROLE admin PRIVILEGES AS COMMANDS
 a|Rows: 13
 |===
 
+<<<<<<< HEAD
 If the built-in `admin` role has been altered or dropped, and needs to be restored to its original state, see xref:5.0@operations-manual:ROOT:configuration/password-and-user-recovery/index.adoc[Operations Manual -> Password and user recovery].
+=======
+If the built-in `admin` role has been altered or dropped, and needs to be restored to its original state, see xref:4.4@operations-manual:ROOT:configuration/password-and-user-recovery/index.adoc[Operations Manual -> Password and user recovery].
+>>>>>>> 28993c8 (Editorial review of the built in roles for access control section (#31))
 
 
 [[access-control-built-in-roles-admin-recreate]]