diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index d910330..01c0817 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -4,10 +4,11 @@
 os_gpg_key_pubkey_name: gpg-pubkey-fd431d51-4ae0493b
 os_gpg_key_pubkey_content: "Red Hat, Inc. (release key 2) <security@redhat.com> fd431d51"
 
-<<<<<<< HEAD
+# disable repo_gpgcheck due to OS default repos
+rhel9cis_rule_enable_repogpg: false
+
 # Vars setup for overiding main.yml
 rhel9cis_sshd:
-n Redhat Stream.
     clientalivecountmax: 3
     clientaliveinterval: 900
     logingracetime: 60
@@ -15,7 +16,3 @@ n Redhat Stream.
     allowgroups: sshd wheel
     # denyusers:
     # denygroups:
-=======
-# disable repo_gpgcheck due to OS default repos
-rhel9cis_rule_enable_repogpg: false
->>>>>>> 29828974d0f17bf0e1a997f99d20f2c042f2b4d5