diff --git a/data/inet6num/fd66:97fe:21c2::_48 b/data/inet6num/fd66:97fe:21c2::_48
index f8154c069..31fbcee75 100644
--- a/data/inet6num/fd66:97fe:21c2::_48
+++ b/data/inet6num/fd66:97fe:21c2::_48
@@ -6,5 +6,9 @@ admin-c:            LIHAHA11-DN42
 tech-c:             LIHAHA11-DN42
 mnt-by:             LANCAN-MNT
 status:             ASSIGNED
+<<<<<<< HEAD
 cidr:               fd66:97fe:21c2::_48
+=======
+cidr:               fd66:97fe:21c2::/48
+>>>>>>> 147fd5b86 (squashed commit:)
 source:             DN42