diff --git a/main.tf b/main.tf
index 56d976a..e2a6952 100644
--- a/main.tf
+++ b/main.tf
@@ -3,6 +3,10 @@ data "template_file" "user_data" {
   template = file("${path.module}/cloud_init.yml")
   vars = {
     login = "admin"
+<<<<<<< HEAD
+=======
+    passwd = "passwd"
+>>>>>>> 51d0c3c (Init Project)
     ip = var.domains[count.index].ip
   }
 }
@@ -53,6 +57,10 @@ resource "libvirt_cloudinit_disk" "commoninit" {
   pool           = libvirt_pool.pool.name
   user_data = data.template_file.user_data[count.index].rendered
   network_config = data.template_file.network_config[count.index].rendered
+<<<<<<< HEAD
+=======
+  
+>>>>>>> 51d0c3c (Init Project)
 }
 
 resource "libvirt_domain" "vm" {