diff --git a/data/route/172.23.99.96_27 b/data/route/172.23.99.96_27
index e38a1786d..32d49a0ca 100644
--- a/data/route/172.23.99.96_27
+++ b/data/route/172.23.99.96_27
@@ -1,5 +1,9 @@
 route:              172.23.99.96/27
+<<<<<<< HEAD
 max-length:         27
 origin:             AS4242423323
+=======
+origin:             AS4242420001
+>>>>>>> 762f6f462ff0e8d2ae6c5add0d0a7c7b90320f3f
 mnt-by:             YUZHEQIANLV-MNT
 source:             DN42
diff --git a/data/route6/fd9f:9b3f:da38::_48 b/data/route6/fd9f:9b3f:da38::_48
index 65b7f70a0..e045a528d 100644
--- a/data/route6/fd9f:9b3f:da38::_48
+++ b/data/route6/fd9f:9b3f:da38::_48
@@ -1,5 +1,9 @@
 route6:             fd9f:9b3f:da38::/48
+<<<<<<< HEAD
 max-length:         48
 origin:             AS4242423323
+=======
+origin:             AS4242420001
+>>>>>>> 762f6f462ff0e8d2ae6c5add0d0a7c7b90320f3f
 mnt-by:             YUZHEQIANLV-MNT
 source:             DN42