diff --git a/data/inetnum/172.20.6.32_27 b/data/inetnum/172.20.6.32_27
index 6bf4f6d1c..07730bcd7 100644
--- a/data/inetnum/172.20.6.32_27
+++ b/data/inetnum/172.20.6.32_27
@@ -5,6 +5,7 @@ cidr:               172.20.6.32/27
 netname:            CKARLS-v4-NETWORK
 descr:              v4 Network of ckarls
 <<<<<<< HEAD
+<<<<<<< HEAD
 country:            XD
 =======
 country:            DE
@@ -23,6 +24,9 @@ country:            DE
 =======
 country:            XD
 >>>>>>> dc7a812da (data/inetnum/172.20.6.32_27 aktualisiert)
+=======
+country:            DE
+>>>>>>> a18cf88fff568218c4b34eed1c2f5fb36be3d4eb
 admin-c:            CKARLS-DN42
 tech-c:             CKARLS-DN42
 mnt-by:             CKARLS-MNT