diff --git a/playbooks/rocky9.yml b/playbooks/rocky9.yml
index 3a0e3bb..ce626c0 100644
--- a/playbooks/rocky9.yml
+++ b/playbooks/rocky9.yml
@@ -18,17 +18,13 @@
     - openssh
 
   vars:
-<<<<<<< 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"
-
     openssh_password_authentication: false
     openssh_permit_root_login: "no"  # Completely disable root SSH
     openssh_challenge_response_auth: false