diff --git a/data/inetnum/172.20.6.32_27 b/data/inetnum/172.20.6.32_27
index 6f1adbe60..0edbab325 100644
--- a/data/inetnum/172.20.6.32_27
+++ b/data/inetnum/172.20.6.32_27
@@ -13,15 +13,24 @@ inetnum:            172.20.6.33 - 172.20.6.62
 cidr:               172.20.6.32/27
 netname:            CKARLS-v4-NETWORK
 descr:              v4 Network of ckarls
+<<<<<<< HEAD
 country:            DE
 >>>>>>> 86c74557b (data/inetnum/172.20.6.32_27 hinzugefügt)
+=======
+country:            XD
+>>>>>>> dc7a812da (data/inetnum/172.20.6.32_27 aktualisiert)
 admin-c:            CKARLS-DN42
 tech-c:             CKARLS-DN42
 mnt-by:             CKARLS-MNT
 status:             ASSIGNED
 <<<<<<< HEAD
+<<<<<<< HEAD
 nserver:            ns1.ckarls.dn42
 nserver:            ns2.ckarls.dn42
 =======
 >>>>>>> 86c74557b (data/inetnum/172.20.6.32_27 hinzugefügt)
+=======
+nserver:            ns1.ckarls.dn42
+nserver:            ns2.ckarls.dn42
+>>>>>>> dc7a812da (data/inetnum/172.20.6.32_27 aktualisiert)
 source:             DN42
\ No newline at end of file