diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index 08a1f1e07eac..162bdae2f3eb 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -275,7 +275,15 @@ def get_normalized_interface_vrf(line):
             "policy ": {"candidate-path ": {}},
             "pcep": {"pcc": {}, "pce ": {}, "pce-config ": {}},
         },
+<<<<<<< HEAD
         "srv6": {"locators": {"locator ": {}}},
+=======
+        "srv6": {
+            "locators": {"locator ": {}},
+            "encapsulation": {},
+            "formats": {"format": {}},
+        },
+>>>>>>> 5b8b821f2 (tools: Add missing formats keyword to segment-routing in frr-reload)
     },
     "nexthop-group ": {},
     "route-map ": {},