diff --git a/ansible-playbooks/create_New_template.yml b/ansible-playbooks/create_New_template.yml
index 498d196..32eef5e 100644
--- a/ansible-playbooks/create_New_template.yml
+++ b/ansible-playbooks/create_New_template.yml
@@ -1,22 +1,16 @@
 ---
 - name: test yml file
-<<<<<<< HEAD
   hosts: zabbix-server
-=======
   hosts: all
->>>>>>> 0909eb507c2ae42777f4bd5d0c77791de12459b8
   tasks:
   - name: Create a new Zabbix template linked to groups, macros and templates
     local_action:
       module: zabbix_template
-      server_url: http://10.201.11.7/zabbix
-      login_user: Admin
-      login_password: zabbix
-<<<<<<< HEAD
+      server_url: https://***
+      login_user: **
+      login_password: **
       template_name: New_temp
-=======
       template_name: test
->>>>>>> 0909eb507c2ae42777f4bd5d0c77791de12459b8
       template_groups : Templates
       state: present