diff --git a/data/inet6num/fdc0:88e8:644::_48 b/data/inet6num/fdc0:88e8:644::_48
index 8f52e8c7d..aeac1ef1e 100644
--- a/data/inet6num/fdc0:88e8:644::_48
+++ b/data/inet6num/fdc0:88e8:644::_48
@@ -1,13 +1,17 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> f0a9d1b39 (data/inet6num/fdc0:88e8:644::_48 aktualisiert)
+=======
+>>>>>>> refs/remotes/origin/master
 inet6num:           fdc0:88e8:0644:0000:0000:0000:0000:0000 - fdc0:88e8:0644:ffff:ffff:ffff:ffff:ffff
 cidr:               fdc0:88e8:644::/48
 netname:            CKARLS-v6-NETWORK
 descr:              v6 Network of ckarls
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 inet6num:           fdc0:88e8:6440:0000:0000:0000:0000 - fdc0:88e8:644f:ffff:ffff:ffff:ffff:ffff
 =======
@@ -26,12 +30,16 @@ country:            DE
 =======
 country:            XD
 >>>>>>> fe8de7dd0 (data/inet6num/fdc0:88e8:644::_48 aktualisiert)
+=======
+country:            DE
+>>>>>>> refs/remotes/origin/master
 admin-c:            CKARLS-DN42
 tech-c:             CKARLS-DN42
 mnt-by:             CKARLS-MNT
 status:             ASSIGNED
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 nserver:            ns1.ckarls.dn42
 nserver:            ns2.ckarls.dn42
 =======
@@ -40,4 +48,8 @@ nserver:            ns2.ckarls.dn42
 nserver:            ns1.ckarls.dn42
 nserver:            ns2.ckarls.dn42
 >>>>>>> fe8de7dd0 (data/inet6num/fdc0:88e8:644::_48 aktualisiert)
+=======
+nserver:            ns1.ckarls.dn42
+nserver:            ns2.ckarls.dn42
+>>>>>>> refs/remotes/origin/master
 source:             DN42
\ No newline at end of file
diff --git a/data/inetnum/172.20.6.32_27 b/data/inetnum/172.20.6.32_27
index 2cf9c78f1..c2a6dff65 100644
--- a/data/inetnum/172.20.6.32_27
+++ b/data/inetnum/172.20.6.32_27
@@ -2,7 +2,7 @@ inetnum:            172.20.6.32 - 172.20.6.63
 cidr:               172.20.6.32/27
 netname:            CKARLS-v4-NETWORK
 descr:              v4 Network of ckarls
-country:            XD
+country:            DE
 admin-c:            CKARLS-DN42
 tech-c:             CKARLS-DN42
 mnt-by:             CKARLS-MNT