diff --git a/hosts.yml b/hosts.yml
index 12b78d0..57df6bc 100644
--- a/hosts.yml
+++ b/hosts.yml
@@ -95,12 +95,6 @@ datacenter:
             m-server.home.lan:
             zabbix.home.lan:
           vars:
-<<<<<<< HEAD
-            ansible_python_interpreter: /opt/bin/python
-            ansible_ssh_user: admin
-            ansible_ssh_pass: l4c1!j4yd33?Du5lo
-        raspberry:
-=======
             ansible_python_interpreter: /usr/bin/python3
             ansible_user: jd
             ansible_password: l4c1j4yd33Du5lo
@@ -109,7 +103,6 @@ datacenter:
             ansible_become_user: root
             ansible_become_password: l4c1j4yd33Du5lo
         nas:
->>>>>>> a2272a39029fa97337f187f1b490913cd8adbd24
           hosts:
             nas.home.lan:
             
@@ -148,7 +141,7 @@ datacenter:
             ansible_ssh_pass: l4c1j4yd33Du5lo
             ansible_become_user: root
             ansible_become_password: l4c1j4yd33Du5lo
-            ansible_ssh_private_key_file: ~/.ssh/ansible
+            ansible_ssh_private_key_file: ~/.ssh/id_rsa
         nas:
           hosts:
             nas.home.lan:
@@ -156,12 +149,9 @@ datacenter:
           vars:
             ansible_ssh_user: admin
             ansible_ssh_pass: l4c1!j4yd33?Du5lo
-<<<<<<< HEAD
-            ansible_python_interpreter: /share/ZFS530_DATA/.qpkg/QPython39/bin/python3
-=======
             become_method: su
             become_user: admin
             # ansible_user: admin
             # ansible_pass: l4c1!j4yd33?Du5lo1
             ansible_python_interpreter: /share/ZFS530_DATA/.qpkg/QPython312/bin/python3
->>>>>>> a2272a39029fa97337f187f1b490913cd8adbd24
+            ansible_ssh_private_key_file: ~/.ssh/id_rsa