diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index 0c51be55545..7e740aacbc4 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -139,11 +139,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-06-02 13:40:34.435822",
-=======
  "modified": "2025-12-02 13:58:03.378607",
->>>>>>> e08805128b (fix: exclude is_group records)
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Customer Group",
@@ -217,11 +213,6 @@
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
-<<<<<<< HEAD
- "states": []
-}
-=======
  "states": [],
  "translated_doctype": 1
 }
->>>>>>> e08805128b (fix: exclude is_group records)
diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json
index 189347880d2..763712a70ca 100644
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json
@@ -135,11 +135,7 @@
  "is_tree": 1,
  "links": [],
  "max_attachments": 3,
-<<<<<<< HEAD
- "modified": "2024-01-30 14:08:38.485616",
-=======
  "modified": "2025-12-02 13:58:30.018021",
->>>>>>> e08805128b (fix: exclude is_group records)
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Item Group",
@@ -211,11 +207,6 @@
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
-<<<<<<< HEAD
- "states": []
-}
-=======
  "states": [],
  "translated_doctype": 1
 }
->>>>>>> e08805128b (fix: exclude is_group records)
diff --git a/erpnext/setup/doctype/supplier_group/supplier_group.json b/erpnext/setup/doctype/supplier_group/supplier_group.json
index 0edfdf8c802..c93572fd3a3 100644
--- a/erpnext/setup/doctype/supplier_group/supplier_group.json
+++ b/erpnext/setup/doctype/supplier_group/supplier_group.json
@@ -108,11 +108,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-12-24 11:16:12.486719",
-=======
  "modified": "2025-12-02 13:57:57.814686",
->>>>>>> e08805128b (fix: exclude is_group records)
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Supplier Group",
@@ -177,11 +173,6 @@
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "ASC",
-<<<<<<< HEAD
- "states": []
-}
-=======
  "states": [],
  "translated_doctype": 1
 }
->>>>>>> e08805128b (fix: exclude is_group records)
diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json
index c0cfb79a611..8aa6d1e204c 100644
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/erpnext/setup/doctype/territory/territory.json
@@ -124,11 +124,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-12-24 11:16:39.964956",
-=======
  "modified": "2025-12-02 13:58:55.190485",
->>>>>>> e08805128b (fix: exclude is_group records)
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Territory",
@@ -196,11 +192,6 @@
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
-<<<<<<< HEAD
- "states": []
-}
-=======
  "states": [],
  "translated_doctype": 1
 }
->>>>>>> e08805128b (fix: exclude is_group records)