diff --git a/html/templates/intel/esxi.yml b/html/templates/intel/esxi.yml
index e9b3ef7..b20f719 100644
--- a/html/templates/intel/esxi.yml
+++ b/html/templates/intel/esxi.yml
@@ -40,3 +40,7 @@ qemu_version: 4.1.0
 qemu_options: -machine pc,accel=kvm -serial none -nographic -no-user-config -nodefaults
   -display none -vga std -rtc base=utc -cpu host
 ...
+<<<<<<< HEAD
+=======
+           
+>>>>>>> f507fee7efbfaeeb0fbb6ff339f1497ed0839eed