diff --git a/zones/vadia.eu.org.zone b/zones/vadia.eu.org.zone
index 976cd5a..ac50e41 100644
--- a/zones/vadia.eu.org.zone
+++ b/zones/vadia.eu.org.zone
@@ -1,5 +1,10 @@
+<<<<<<< HEAD
 @                          10800   IN  SOA     ns1.dns-witch.net.eu.org. june.lacoloc.cafe.  (
                              2021022103   ;  Numero
+=======
+@                          10800   IN  SOA     ns1.dns-witch.net.eu.org. dns-witch.familier.net.eu.org  (
+                             2023050101   ;  Numero
+>>>>>>> af8178e92cf30e5d97e6199da891f7771934cdc4
                              28800        ;  Refresh
                              14400        ;  Retry
                              3600000      ;  Expire
@@ -8,9 +13,13 @@
 @	IN 3600   NS  ns1.dns-witch.net.eu.org.
 @	IN 3600   NS  ns2.dns-witch.net.eu.org.
 
+<<<<<<< HEAD
 ; A Records
 @	IN 3600	  A   82.123.22.107
 
 ; AAAA Records
 
 ; CNAME Records
+=======
+@   IN 3600   A   82.123.22.107
+>>>>>>> af8178e92cf30e5d97e6199da891f7771934cdc4