Fix merge conflicts (#3348)

LGTM

Author: jself-sudoku

downstream/assemblies/eda/assembly-eda-credentials.adoc

@@ -8,7 +8,7 @@ Credentials authenticate users when launching jobs against machines and importin
 
 You can grant users and teams the ability to use these credentials without exposing the credential to the user. If a user moves to a different team or leaves the organization, you do not have to rekey all of your systems just because that credential was previously available.
 
-[IMPORTANT]
+[NOTE]
 ====
 In the context of {ControllerName} and {EDAcontroller}, you can use both `extra_vars` and credentials to store a variety of information. However, credentials are the preferred method of storing sensitive information such as passwords or API keys because they offer better security and centralized management, whereas `extra_vars` are more suitable for passing dynamic, non-sensitive data.
 ====

downstream/modules/eda/proc-eda-set-up-rulebook-activation.adoc

@@ -52,7 +52,7 @@ Rulebook activation enabled?:: This automatically enables the rulebook activatio
 Variables:: The variables for the rulebook are in a JSON or YAML format.
 The content would be equivalent to the file passed through the `--vars` flag of ansible-rulebook command.
 +
-[IMPORTANT]
+[NOTE]
 ====
 In the context of {ControllerName} and {EDAcontroller}, you can use both `extra_vars` and credentials to store a variety of information. However, credentials are the preferred method of storing sensitive information such as passwords or API keys because they offer better security and centralized management, whereas `extra_vars` are more suitable for passing dynamic, non-sensitive data.
 ====