diff --git a/data/aut-num/AS4242422597 b/data/aut-num/AS4242422597
index bbca67669..c33643816 100644
--- a/data/aut-num/AS4242422597
+++ b/data/aut-num/AS4242422597
@@ -1,5 +1,9 @@
 aut-num:            AS4242422597
-as-name:            AS-GOOSE-DN42
+<<<<<<< Updated upstream
+as-name:            GOOSE Net
+=======
+as-name:            GOOSE-Net
+>>>>>>> Stashed changes
 admin-c:            GOOSE-DN42
 tech-c:             GOOSE-DN42
 mnt-by:             GOOSE-MNT