diff --git a/data/inetnum/172.20.10.32_27 b/data/inetnum/172.20.10.32_27
index 575a3d4e4..663c43cee 100644
--- a/data/inetnum/172.20.10.32_27
+++ b/data/inetnum/172.20.10.32_27
@@ -6,5 +6,10 @@ country:            ID
 admin-c:            DALONET-DN42
 tech-c:             DALONET-DN42
 mnt-by:             DALONET-MNT
+<<<<<<< HEAD
+=======
+nserver:            ns1.dalonet.dn42
+nserver:            ns2.dalonet.dn42
+>>>>>>> 0e5c90c92 (squashed commit:)
 status:             ASSIGNED
 source:             DN42