diff --git a/playbooks/rocky9.yml b/playbooks/rocky9.yml
index 4918eee..3a0e3bb 100644
--- a/playbooks/rocky9.yml
+++ b/playbooks/rocky9.yml
@@ -1,7 +1,7 @@
 ---
 - name: Initial Rocky9 Configuration
 
-  hosts: 
+  hosts:
     - rocky9-template
   # kuber-node01
   #    - 172.20.21.193
@@ -21,6 +21,10 @@
 <<<<<<< HEAD
     ansible_ssh_user: root
     ansible_ssh_password: nmklop90
+=======
+    # ansible_ssh_user: root
+    # ansible_ssh_password: nmklop90
+>>>>>>> 39145902871af46589d5e9fd196edbf6dd8ea849
     epel_repo: true
     reboot_system: false
     hostname: "{{ inventory_hostname }}.local.mrwho.ru"
@@ -32,7 +36,7 @@
     openssh_enable_persourcepenalties: true
     openssh_persource_authfail_penalty: "10s"  # Aggressive penalty
     openssh_persource_maxstartups: "5:30:10"   # Very restrictive
-    # Disable all port forwarding 
+    # Disable all port forwarding
     openssh_disable_forwarding_comprehensive: false
     openssh_x11_forwarding: false
     # Restrict to strongest cryptography only
@@ -70,4 +74,3 @@
       - root
       - admin
       - test
-